[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 9/9] qapi: Restrict code generated for user-mode
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 9/9] qapi: Restrict code generated for user-mode |
Date: |
Mon, 16 Mar 2020 01:11:11 +0100 |
A lot of QAPI generated code is never used by user-mode.
Rewrite the QAPI_COMMON_MODULES variable one entry per line,
and split it in 3 groups:
- always used
- use by system-mode or tools
- only used by system-mode
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
qapi/Makefile.objs | 37 +++++++++++++++++++++++++++++++++----
1 file changed, 33 insertions(+), 4 deletions(-)
diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs
index 4673ab7490..18435db426 100644
--- a/qapi/Makefile.objs
+++ b/qapi/Makefile.objs
@@ -5,11 +5,40 @@ util-obj-y += opts-visitor.o qapi-clone-visitor.o
util-obj-y += qmp-event.o
util-obj-y += qapi-util.o
-QAPI_COMMON_MODULES = audio authz block-core block char common control crypto
-QAPI_COMMON_MODULES += dump error introspect job machine migration misc
-QAPI_COMMON_MODULES += net pragma qdev qom rdma rocker run-state sockets tpm
-QAPI_COMMON_MODULES += trace transaction ui
+QAPI_COMMON_MODULES = common
+QAPI_COMMON_MODULES += introspect
+QAPI_COMMON_MODULES += misc
+
+ifeq ($(CONFIG_SOFTMMU),y)
+QAPI_COMMON_MODULES += audio
+QAPI_COMMON_MODULES += dump
+QAPI_COMMON_MODULES += machine
+QAPI_COMMON_MODULES += migration
+QAPI_COMMON_MODULES += net rocker
+QAPI_COMMON_MODULES += qdev
+QAPI_COMMON_MODULES += rdma
+QAPI_COMMON_MODULES += tpm
+QAPI_COMMON_MODULES += trace
+QAPI_COMMON_MODULES += ui
QAPI_TARGET_MODULES = machine-target misc-target
+endif # CONFIG_SOFTMMU
+
+ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)
+QAPI_COMMON_MODULES += authz
+QAPI_COMMON_MODULES += block
+QAPI_COMMON_MODULES += block-core
+QAPI_COMMON_MODULES += char
+QAPI_COMMON_MODULES += control
+QAPI_COMMON_MODULES += crypto
+QAPI_COMMON_MODULES += error
+QAPI_COMMON_MODULES += job
+QAPI_COMMON_MODULES += pragma
+QAPI_COMMON_MODULES += qom
+QAPI_COMMON_MODULES += run-state
+QAPI_COMMON_MODULES += sockets
+QAPI_COMMON_MODULES += transaction
+endif # CONFIG_SOFTMMU || CONFIG_TOOLS
+
QAPI_MODULES = $(QAPI_COMMON_MODULES) $(QAPI_TARGET_MODULES)
util-obj-y += qapi-builtin-types.o
--
2.21.1
- [PATCH v2 0/9] user-mode: Prune build dependencies (part 3), Philippe Mathieu-Daudé, 2020/03/15
- [PATCH v2 1/9] hw/core/qdev-properties: Use qemu_strtol() in set_mac() handler, Philippe Mathieu-Daudé, 2020/03/15
- [PATCH v2 2/9] hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr(), Philippe Mathieu-Daudé, 2020/03/15
- [PATCH v2 3/9] hw/core/qdev-properties: Fix code style, Philippe Mathieu-Daudé, 2020/03/15
- [PATCH v2 4/9] hw/core/qdev-properties: Export enum-related functions, Philippe Mathieu-Daudé, 2020/03/15
- [PATCH v2 5/9] hw/core/qdev-properties: Export qdev_prop_enum, Philippe Mathieu-Daudé, 2020/03/15
- [PATCH v2 6/9] hw/core/qdev-properties: Export some integer-related functions, Philippe Mathieu-Daudé, 2020/03/15
- [PATCH v2 8/9] hw/core: Add qdev stub for user-mode, Philippe Mathieu-Daudé, 2020/03/15
- [PATCH v2 9/9] qapi: Restrict code generated for user-mode,
Philippe Mathieu-Daudé <=
- [PATCH v2 7/9] hw/core/qdev-properties: Extract system-mode specific properties, Philippe Mathieu-Daudé, 2020/03/15
- Re: [PATCH v2 0/9] user-mode: Prune build dependencies (part 3), Philippe Mathieu-Daudé, 2020/03/18