[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/17] qdev: Include qdev code into *-user, too
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 04/17] qdev: Include qdev code into *-user, too |
Date: |
Tue, 8 Jan 2013 21:56:21 +0100 |
From: Eduardo Habkost <address@hidden>
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>
Signed-off-by: Andreas Färber <address@hidden>
---
Makefile.objs | 8 ++++++++
hw/Makefile.objs | 9 +++++++--
2 Dateien geändert, 15 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
diff --git a/Makefile.objs b/Makefile.objs
index a3eab4b..12a314e 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -22,6 +22,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
@@ -182,6 +189,7 @@ nested-vars += \
user-obj-y \
common-obj-y \
universal-obj-y \
+ hw-core-obj-y \
extra-obj-y \
trace-obj-y
dummy := $(call unnest-vars)
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index b8bbed3..6b8a68c 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/ pci/
common-obj-y += loader.o
common-obj-$(CONFIG_VIRTIO) += virtio-console.o
@@ -154,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
@@ -180,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.10.4
- [Qemu-devel] [PULL] QOM CPUState patch queue 2013-01-08, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 02/17] libqemustub: vmstate register/unregister stubs, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 03/17] libqemustub: sysbus_get_default() stub, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 01/17] libqemustub: Add qemu_[un]register_reset() stubs, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 05/17] qdev: Don't assume existence of parent bus on unparenting, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 04/17] qdev: Include qdev code into *-user, too,
Andreas Färber <=
- [Qemu-devel] [PATCH 06/17] cpu: Change parent type to Device, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 08/17] target-i386: kvm: Enable all supported KVM features for -cpu host, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 07/17] target-i386: kvm: -cpu host: Use GET_SUPPORTED_CPUID for SVM features, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 09/17] target-i386: check/enforce: Fix CPUID leaf numbers on error messages, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 10/17] target-i386: check/enforce: Do not ignore "hypervisor" flag, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 12/17] target-i386: check/enforce: Check SVM flag support as well, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 11/17] target-i386: check/enforce: Check all CPUID.80000001H.EDX bits, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 13/17] target-i386: check/enforce: Eliminate check_feat field, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 16/17] target-i386: Sanitize AMD's ext2_features at realize time, Andreas Färber, 2013/01/08
- [Qemu-devel] [PATCH 15/17] target-i386: Filter out unsupported features at realize time, Andreas Färber, 2013/01/08