[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/8] include qdev code into *-user, too
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 7/8] include qdev code into *-user, too |
Date: |
Wed, 5 Dec 2012 14:49:12 -0200 |
The code depends on some functions from qemu-option.o, so add
qemu-option.o to universal-obj-y to make sure it's included.
Signed-off-by: Eduardo Habkost <address@hidden>
---
Changes v1 -> v2:
- Keep files on the hw/ directory
(it's simply easier to keep them there, as qdev.o depends on irq.o)
- Add a $(hw-core-obj-y) variable to Makefile.objs for the qdev core code
- Add irq.o to the list of core qdev files
(as now the gpio code is being kept inside qdev.c)
Changes v2 -> v3:
- Add reset.o to hw-core-obj-y
Changes v3 -> v4:
- Removed reset.o again (it was replaced by stubs on libqemustub.a)
---
Makefile.objs | 8 ++++++++
hw/Makefile.objs | 9 +++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index 0a0a33a..8fe4991 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -31,6 +31,13 @@ qom-obj-y = qom/
universal-obj-y += $(qom-obj-y)
#######################################################################
+# Core hw code (qdev core)
+hw-core-obj-y += hw/
+hw-core-obj-y += qemu-option.o
+
+universal-obj-y += $(hw-core-obj-y)
+
+#######################################################################
# oslib-obj-y is code depending on the OS (win32 vs posix)
oslib-obj-y = osdep.o cutils.o qemu-timer-common.o
oslib-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o
@@ -253,5 +260,6 @@ nested-vars += \
block-obj-y \
user-obj-y \
common-obj-y \
+ hw-core-obj-y \
extra-obj-y
dummy := $(call unnest-vars)
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 96a8365..1815536 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -1,3 +1,9 @@
+# core qdev-related obj files, also used by *-user:
+hw-core-obj-y += qdev.o qdev-properties.o
+# irq.o needed for qdev GPIO handling:
+hw-core-obj-y += irq.o
+
+
common-obj-y = usb/ ide/
common-obj-y += loader.o
common-obj-$(CONFIG_VIRTIO) += virtio-console.o
@@ -158,7 +164,6 @@ common-obj-$(CONFIG_SOUND) += $(sound-obj-y)
common-obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/
common-obj-y += usb/
-common-obj-y += irq.o
common-obj-$(CONFIG_PTIMER) += ptimer.o
common-obj-$(CONFIG_MAX7310) += max7310.o
common-obj-$(CONFIG_WM8750) += wm8750.o
@@ -184,7 +189,7 @@ common-obj-$(CONFIG_SD) += sd.o
common-obj-y += bt.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o
common-obj-y += bt-hci-csr.o
common-obj-y += msmouse.o ps2.o
-common-obj-y += qdev.o qdev-properties.o qdev-monitor.o
+common-obj-y += qdev-monitor.o
common-obj-y += qdev-properties-system.o
common-obj-$(CONFIG_BRLAPI) += baum.o
--
1.7.11.7
- Re: [Qemu-devel] [PATCH 5/8] qdev: Coding style fixes, (continued)
- [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Eduardo Habkost, 2012/12/05
- Re: [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Andreas Färber, 2012/12/12
- Re: [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Eduardo Habkost, 2012/12/12
- Re: [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Igor Mammedov, 2012/12/12
- Re: [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Eduardo Habkost, 2012/12/12
- Re: [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Andreas Färber, 2012/12/14
- Re: [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Paolo Bonzini, 2012/12/14
- Re: [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Andreas Färber, 2012/12/14
- Re: [Qemu-devel] [PATCH 8/8] qom: Make CPU a child of DeviceState, Eduardo Habkost, 2012/12/14
[Qemu-devel] [PATCH 7/8] include qdev code into *-user, too,
Eduardo Habkost <=
[Qemu-devel] [PATCH 3/8] libqemustub: vmstate register/unregister stubs, Eduardo Habkost, 2012/12/05
[Qemu-devel] [PATCH 1/8] Move -I$(SRC_PATH)/include compiler flag to Makefile.objs, Eduardo Habkost, 2012/12/05
[Qemu-devel] [PATCH 6/8] qdev-properties.c: Separate core from the code used only by qemu-system-*, Eduardo Habkost, 2012/12/05