From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbnIe-0007uK-Vm for qemu-devel@nongnu.org; Tue, 15 Sep 2015 06:17:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbnId-0004o0-Ir for qemu-devel@nongnu.org; Tue, 15 Sep 2015 06:17:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34285) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbnId-0004nt-CH for qemu-devel@nongnu.org; Tue, 15 Sep 2015 06:17:19 -0400 From: "Daniel P. Berrange" Date: Tue, 15 Sep 2015 11:17:00 +0100 Message-Id: <1442312227-19153-5-git-send-email-berrange@redhat.com> In-Reply-To: <1442312227-19153-1-git-send-email-berrange@redhat.com> References: <1442312227-19153-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH PULL v2 04/11] qom: allow QOM to be linked into tools binaries List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell The qom objects are currently added to common-obj-y which is only linked into the system emulators. The later crypto patches will depend on QOM infrastructure and will also be used from tools binaries. Thus the QOM objects are moved into a new qom-obj-y variable which can be referenced when linking tools, system emulators and tests. Signed-off-by: Daniel P. Berrange --- Makefile | 8 +++++--- Makefile.objs | 5 +++++ Makefile.target | 2 ++ qom/Makefile.objs | 7 ++++--- tests/Makefile | 4 +--- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index bb06c4f..8c096a7 100644 --- a/Makefile +++ b/Makefile @@ -153,6 +153,7 @@ dummy := $(call unnest-vars,, \ block-obj-y \ block-obj-m \ crypto-obj-y \ + qom-obj-y \ common-obj-y \ common-obj-m) @@ -175,6 +176,7 @@ SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) $(SOFTMMU_SUBDIR_RULES): $(block-obj-y) $(SOFTMMU_SUBDIR_RULES): $(crypto-obj-y) +$(SOFTMMU_SUBDIR_RULES): $(qom-obj-y) $(SOFTMMU_SUBDIR_RULES): config-all-devices.mak subdir-%: @@ -229,9 +231,9 @@ util/module.o-cflags = -D'CONFIG_BLOCK_MODULES=$(block-modules)' qemu-img.o: qemu-img-cmds.h -qemu-img$(EXESUF): qemu-img.o $(block-obj-y) $(crypto-obj-y) libqemuutil.a libqemustub.a -qemu-nbd$(EXESUF): qemu-nbd.o $(block-obj-y) $(crypto-obj-y) libqemuutil.a libqemustub.a -qemu-io$(EXESUF): qemu-io.o $(block-obj-y) $(crypto-obj-y) libqemuutil.a libqemustub.a +qemu-img$(EXESUF): qemu-img.o $(block-obj-y) $(crypto-obj-y) $(qom-obj-y) libqemuutil.a libqemustub.a +qemu-nbd$(EXESUF): qemu-nbd.o $(block-obj-y) $(crypto-obj-y) $(qom-obj-y) libqemuutil.a libqemustub.a +qemu-io$(EXESUF): qemu-io.o $(block-obj-y) $(crypto-obj-y) $(qom-obj-y) libqemuutil.a libqemustub.a qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o diff --git a/Makefile.objs b/Makefile.objs index c7ed989..2ff4224 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -25,6 +25,11 @@ block-obj-m = block/ crypto-obj-y = crypto/ +####################################################################### +# qom-obj-y is code used by both qemu system emulation and qemu-img + +qom-obj-y = qom/ + ###################################################################### # smartcard diff --git a/Makefile.target b/Makefile.target index 8235202..4c8eaca 100644 --- a/Makefile.target +++ b/Makefile.target @@ -171,6 +171,7 @@ dummy := $(call unnest-vars,.., \ block-obj-y \ block-obj-m \ crypto-obj-y \ + qom-obj-y \ common-obj-y \ common-obj-m) target-obj-y := $(target-obj-y-save) @@ -178,6 +179,7 @@ all-obj-y += $(common-obj-y) all-obj-y += $(target-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(crypto-obj-y) +all-obj-$(CONFIG_SOFTMMU) += $(qom-obj-y) $(QEMU_PROG_BUILD): config-devices.mak diff --git a/qom/Makefile.objs b/qom/Makefile.objs index 985003b..516349e 100644 --- a/qom/Makefile.objs +++ b/qom/Makefile.objs @@ -1,3 +1,4 @@ -common-obj-y = object.o container.o qom-qobject.o -common-obj-y += cpu.o -common-obj-y += object_interfaces.o +qom-obj-y = object.o container.o qom-qobject.o +qom-obj-y += object_interfaces.o + +common-obj-y = cpu.o diff --git a/tests/Makefile b/tests/Makefile index d77ccee..ddd5148 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -284,9 +284,7 @@ QEMU_CFLAGS += -I$(SRC_PATH)/tests # Deps that are common to various different sets of tests below test-util-obj-y = libqemuutil.a libqemustub.a -test-qom-obj-y = qom/object.o qom/qom-qobject.o \ - qom/container.o qom/object_interfaces.o \ - $(test-util-obj-y) +test-qom-obj-y = $(qom-obj-y) $(test-util-obj-y) test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o \ tests/test-qapi-event.o \ $(test-qom-obj-y) -- 2.4.3