[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 11/11] qapi: Restrict code generated for user-mode
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 11/11] qapi: Restrict code generated for user-mode |
Date: |
Wed, 30 Sep 2020 18:49:49 +0200 |
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 3 groups:
- always used
- use by system-mode or tools (usually by the block layer)
- only used by system-mode
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Resetting due to Meson update:
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
qapi/meson.build | 51 ++++++++++++++++++++++++++++++++++--------------
1 file changed, 36 insertions(+), 15 deletions(-)
diff --git a/qapi/meson.build b/qapi/meson.build
index 7c4a89a882..ba9677ba97 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -14,39 +14,60 @@ util_ss.add(files(
))
qapi_all_modules = [
+ 'common',
+ 'introspect',
+ 'misc',
+]
+
+qapi_system_modules = [
'acpi',
'audio',
+ 'dump',
+ 'machine-target',
+ 'machine',
+ 'migration',
+ 'misc-target',
+ 'net',
+ 'pci',
+ 'qdev',
+ 'rdma',
+ 'rocker',
+ 'tpm',
+ 'trace',
+]
+
+# system or tools
+qapi_block_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
+elif have_user
+ # Temporary kludge because X86CPUFeatureWordInfo is not
+ # restricted to system-mode. This should be removed (along
+ # with target/i386/feature-stub.c) once target/i386/cpu.c
+ # has been cleaned.
+ qapi_all_modules += ['machine-target']
+endif
+
+if have_block
+ qapi_all_modules += qapi_block_modules
+endif
+
qapi_storage_daemon_modules = [
'block-core',
'char',
--
2.26.2
- [PATCH v3 03/11] hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr(), (continued)
- [PATCH v3 03/11] hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr(), Philippe Mathieu-Daudé, 2020/09/30
- [PATCH v3 04/11] hw/core/qdev-properties: Fix code style, Philippe Mathieu-Daudé, 2020/09/30
- [PATCH v3 02/11] hw/core/qdev-properties: Use qemu_strtol() in set_mac() handler, Philippe Mathieu-Daudé, 2020/09/30
- [PATCH v3 06/11] hw/core/qdev-properties: Export qdev_prop_enum, Philippe Mathieu-Daudé, 2020/09/30
- [PATCH v3 05/11] hw/core/qdev-properties: Export enum-related functions, Philippe Mathieu-Daudé, 2020/09/30
- [PATCH v3 08/11] hw/core/qdev-properties: Extract system-mode specific properties, Philippe Mathieu-Daudé, 2020/09/30
- [PATCH v3 07/11] hw/core/qdev-properties: Export some integer-related functions, Philippe Mathieu-Daudé, 2020/09/30
- [PATCH v3 09/11] hw/core: Add qdev stub for user-mode, Philippe Mathieu-Daudé, 2020/09/30
- [PATCH v3 10/11] target/i386: Restrict X86CPUFeatureWord to X86 targets, Philippe Mathieu-Daudé, 2020/09/30
- [PATCH v3 11/11] qapi: Restrict code generated for user-mode,
Philippe Mathieu-Daudé <=
- Re: [PATCH v3 00/11] user-mode: Prune build dependencies (part 3), Eduardo Habkost, 2020/09/30