[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 23/24] include qdev code into *-user, too
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 23/24] include qdev code into *-user, too |
Date: |
Fri, 9 Nov 2012 12:56:51 -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)
---
Makefile.objs | 8 ++++++++
hw/Makefile.objs | 8 ++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index 593a592..be3c8ef 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -18,6 +18,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
@@ -244,5 +251,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 4833b90..2c931e9 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -1,3 +1,8 @@
+# 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
@@ -155,7 +160,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
@@ -181,7 +185,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
- [Qemu-devel] [PATCH 00/24] CPU DeviceState v7, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 02/24] user: rename qemu-types.h to qemu-user-types.h, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 15/24] qlist.h: do not include qemu-common.h, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 20/24] qdev: add weak aliases for vmstate handling on qdev.c, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 12/24] qga/channel-posix.c: include headers it needs, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 07/24] qemu-fsdev-dummy.c: include module.h, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 23/24] include qdev code into *-user, too,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 24/24] qom: make CPU a child of DeviceState, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 14/24] sysemu.h: include qemu-types.h instead of qemu-common.h, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 16/24] qapi-types.h: don't include qemu-common.h, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 21/24] qdev: add weak alias to sysbus_get_default() on qdev.c, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 04/24] move qemu_irq typedef out of cpu-common.h, Eduardo Habkost, 2012/11/09