Skip to contentSkip to conversation

user-mode: Prune build dependencies (part 3)

PATCH In review Philippe Mathieu-Daudé 2 participants 4 messages Oct 2, 2020 Arm/Amlogic Meson SoC support

v4 of 5 In review Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v4 cover user-mode: Prune build dependencies (part 3)

This is the third part of a series reducing user-mode dependencies. By stripping out unused code, the build and testing time is reduced (as is space used by objects).

Part 3:
- Reduce user-mode QAPI generated files

Since v3:
- Keep qdev.json in user-mode (no need for qdev-system stub for qapi_event_send_device_deleted, Paolo)
- Keep machine.json in user-mode (no need to restrict X86CPUFeatureWord to x86 architecture, Eduardo)

Since v2:
- Fixed UuidInfo placed in incorrect json
- Rebased on Meson
- Include X86CPUFeatureWord unmerged from part 2

Since v1:
- Addressed Richard and Paolo review comments

v3: https://www.mail-archive.com/[email protected]/msg746423.html
v2: https://www.mail-archive.com/[email protected]/msg688879.html
v1: https://www.mail-archive.com/[email protected]/msg688486.html

Based on https://github.com/ehabkost/qemu.git machine-next

Philippe Mathieu-Daudé (1):
qapi: Restrict code generated for user-mode

 qapi/meson.build | 51 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 15 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH v4 1/1 qapi: Restrict code generated for user-mode

A lot of QAPI generated code is never used by user-mode.

Split out qapi_system_modules and qapi_system_or_tools_modules from the qapi_all_modules array. We now have 4 groups:
- always used
- only used by system-mode
- not used by user-mode
- not used by tools

---
 qapi/meson.build | 51 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 15 deletions(-)
qapi/meson.build +36 -15
index 7c4a89a882..10cf01ef65 100644
@@ -14,39 +14,60 @@ util_ss.add(files(
 ))
 
 qapi_all_modules = [
+  'common',
+  'introspect',
+  'misc',
+]
+
+qapi_system_modules = [
   'acpi',
   'audio',
+  'dump',
+  'machine-target',
+  'migration',
+  'misc-target',
+  'net',
+  'pci',
+  'rdma',
+  'rocker',
+  'tpm',
+  'trace',
+]
+
+qapi_system_or_user_modules = [
+  'machine', # X86CPUFeatureWordInfo
+  'qdev',
+]
+
+qapi_system_or_tools_modules = [
   'authz',
   'block-core',
   'block',
   'char',
-  'common',
   'control',
   'crypto',
-  'dump',
   'error',
-  'introspect',
   'job',
-  'machine',
-  'machine-target',
-  'migration',
-  'misc',
-  'misc-target',
-  'net',
   'pragma',
-  'qdev',
-  'pci',
   'qom',
-  'rdma',
-  'rocker',
   'run-state',
   'sockets',
-  'tpm',
-  'trace',
   'transaction',
   'ui',
 ]
 
+if have_system
+  qapi_all_modules += qapi_system_modules
+endif
+
+if have_system or have_user
+  qapi_all_modules += qapi_system_or_user_modules
+endif
+
+if have_system or have_tools
+  qapi_all_modules += qapi_system_or_tools_modules
+endif
+
 qapi_storage_daemon_modules = [
   'block-core',
   'char',
Signature · 1 line
2.26.2
Reviewed-by on v4 1/1
#2 lore raw

Re: [PATCH v4 1/1] qapi: Restrict code generated for user-mode

Quoted 85 lines · Philippe Mathieu-Daudé

A lot of QAPI generated code is never used by user-mode.

Split out qapi_system_modules and qapi_system_or_tools_modules from the qapi_all_modules array. We now have 4 groups:
- always used
- only used by system-mode
- not used by user-mode
- not used by tools

---
 qapi/meson.build | 51 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 15 deletions(-)
qapi/meson.build +29 -15
index 7c4a89a882..10cf01ef65 100644
@@ -14,39 +14,60 @@ util_ss.add(files(
 ))
 
 qapi_all_modules = [
+  'common',
+  'introspect',
+  'misc',
+]
+
+qapi_system_modules = [
   'acpi',
   'audio',
+  'dump',
+  'machine-target',
+  'migration',
+  'misc-target',
+  'net',
+  'pci',
+  'rdma',
+  'rocker',
+  'tpm',
+  'trace',
+]
+
+qapi_system_or_user_modules = [
+  'machine', # X86CPUFeatureWordInfo
+  'qdev',
+]
+
+qapi_system_or_tools_modules = [
   'authz',
   'block-core',
   'block',
   'char',
-  'common',
   'control',
   'crypto',
-  'dump',
   'error',
-  'introspect',
   'job',
-  'machine',
-  'machine-target',
-  'migration',
-  'misc',
-  'misc-target',
-  'net',
   'pragma',
-  'qdev',
-  'pci',
   'qom',
-  'rdma',
-  'rocker',
   'run-state',
   'sockets',
-  'tpm',
-  'trace',
   'transaction',
   'ui',
 ]
 
+if have_system
+  qapi_all_modules += qapi_system_modules
+endif
+
+if have_system or have_user

qapi/meson.build util_ss.add(files( · line 73

Quoted 10 lines
qapi/meson.build +7 -0
+  qapi_all_modules += qapi_system_or_user_modules
+endif
+
+if have_system or have_tools
+  qapi_all_modules += qapi_system_or_tools_modules
+endif
+
 qapi_storage_daemon_modules = [
   'block-core',
   'char',
#3 lore raw

Re: [PATCH v4 1/1] qapi: Restrict code generated for user-mode

In reply to Philippe Mathieu-Daudé
Quoted 35 lines · Philippe Mathieu-Daudé

A lot of QAPI generated code is never used by user-mode.

Split out qapi_system_modules and qapi_system_or_tools_modules from the qapi_all_modules array. We now have 4 groups:
- always used
- only used by system-mode
- not used by user-mode
- not used by tools

---
 qapi/meson.build | 51 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 15 deletions(-)
qapi/meson.build +11 -0
index 7c4a89a882..10cf01ef65 100644
@@ -14,39 +14,60 @@ util_ss.add(files(
 ))
 
 qapi_all_modules = [
+  'common',
+  'introspect',
+  'misc',
+]
+
+qapi_system_modules = [
   'acpi',
   'audio',
+  'dump',
+  'machine-target',
+  'migration',
+  'misc-target',
+  'net',

qapi/meson.build util_ss.add(files( · line 39

Quoted 10 lines
qapi/meson.build +10 -0
+  'pci',
+  'rdma',
+  'rocker',
+  'tpm',
+  'trace',
+]
+
+qapi_system_or_user_modules = [
+  'machine', # X86CPUFeatureWordInfo
+  'qdev',

I forgot the justification for this one:

'qdev', # DEVICE_DELETED

Quoted 50 lines
qapi/meson.build +15 -15
+]
+
+qapi_system_or_tools_modules = [
   'authz',
   'block-core',
   'block',
   'char',
-  'common',
   'control',
   'crypto',
-  'dump',
   'error',
-  'introspect',
   'job',
-  'machine',
-  'machine-target',
-  'migration',
-  'misc',
-  'misc-target',
-  'net',
   'pragma',
-  'qdev',
-  'pci',
   'qom',
-  'rdma',
-  'rocker',
   'run-state',
   'sockets',
-  'tpm',
-  'trace',
   'transaction',
   'ui',
 ]
 
+if have_system
+  qapi_all_modules += qapi_system_modules
+endif
+
+if have_system or have_user
+  qapi_all_modules += qapi_system_or_user_modules
+endif
+
+if have_system or have_tools
+  qapi_all_modules += qapi_system_or_tools_modules
+endif
+
 qapi_storage_daemon_modules = [
   'block-core',
   'char',