[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 7/8] include core qdev code into *-user, too
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC 7/8] include core qdev code into *-user, too |
Date: |
Tue, 21 Aug 2012 12:43:01 -0300 |
The code depends on some functions from qemu-option.o, so add
qemu-option.o to qom-obj-y to make sure it's included.
Signed-off-by: Eduardo Habkost <address@hidden>
---
Makefile.objs | 1 +
hw/Makefile.objs | 2 +-
qom/Makefile.objs | 2 +-
hw/qdev-properties.c => qom/device-properties.c | 0
hw/qdev.c => qom/device.c | 0
5 files changed, 3 insertions(+), 2 deletions(-)
rename hw/qdev-properties.c => qom/device-properties.c (100%)
rename hw/qdev.c => qom/device.c (100%)
diff --git a/Makefile.objs b/Makefile.objs
index 4412757..2cf91c2 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -14,6 +14,7 @@ universal-obj-y += $(qobject-obj-y)
#######################################################################
# QOM
qom-obj-y = qom/
+qom-obj-y += qemu-option.o
universal-obj-y += $(qom-obj-y)
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 04d3b5e..c09e291 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -176,7 +176,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-system.o qdev-properties-system.o
common-obj-$(CONFIG_BRLAPI) += baum.o
diff --git a/qom/Makefile.objs b/qom/Makefile.objs
index 5ef060a..9d86d88 100644
--- a/qom/Makefile.objs
+++ b/qom/Makefile.objs
@@ -1,4 +1,4 @@
qom-obj-y = object.o container.o qom-qobject.o
-qom-obj-twice-y = cpu.o
+qom-obj-twice-y = cpu.o device.o device-properties.o
common-obj-y = $(qom-obj-twice-y)
user-obj-y = $(qom-obj-twice-y)
diff --git a/hw/qdev-properties.c b/qom/device-properties.c
similarity index 100%
rename from hw/qdev-properties.c
rename to qom/device-properties.c
diff --git a/hw/qdev.c b/qom/device.c
similarity index 100%
rename from hw/qdev.c
rename to qom/device.c
--
1.7.11.4
- [Qemu-devel] [RFC 0/8] include qdev core in *-user, make CPU child of DeviceState, Eduardo Habkost, 2012/08/21
- [Qemu-devel] [RFC 8/8] make CPU a child of DeviceState, Eduardo Habkost, 2012/08/21
- [Qemu-devel] [RFC 6/8] qdev: use full qdev.h include path on qdev*.c, Eduardo Habkost, 2012/08/21
- [Qemu-devel] [RFC 1/8] move qemu_irq typedef out of cpu-common.h, Eduardo Habkost, 2012/08/21
- [Qemu-devel] [RFC 4/8] cleanup error.h, included qapi-types.h aready has stdbool.h, Eduardo Habkost, 2012/08/21
- [Qemu-devel] [RFC 7/8] include core qdev code into *-user, too,
Eduardo Habkost <=
- [Qemu-devel] [RFC 3/8] qapi-types.h doesn't really need to include qemu-common.h, Eduardo Habkost, 2012/08/21
- [Qemu-devel] [RFC 2/8] qdev: split up header so it can be used in cpu.h, Eduardo Habkost, 2012/08/21
- [Qemu-devel] [RFC 5/8] split qdev into a core and code used only by qemu-system-*, Eduardo Habkost, 2012/08/21
- Re: [Qemu-devel] [RFC 0/8] include qdev core in *-user, make CPU child of DeviceState, Avi Kivity, 2012/08/22