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 <[email protected]> --- Makefile.objs | 3 +++ hw/Makefile.objs | 2 +- qom/Makefile.objs | 2 +- {hw => qom}/qdev-core.c | 0 {hw => qom}/qdev-properties.c | 0 5 files changed, 5 insertions(+), 2 deletions(-) rename {hw => qom}/qdev-core.c (100%) rename {hw => qom}/qdev-properties.c (100%) diff --git a/Makefile.objs b/Makefile.objs index 4412757..7b0950e 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -16,6 +16,9 @@ universal-obj-y += $(qobject-obj-y) qom-obj-y = qom/ universal-obj-y += $(qom-obj-y) +# QOM qdev-core.o requires qemu-option.o: +universal-obj-y += qemu-option.o + ####################################################################### # oslib-obj-y is code depending on the OS (win32 vs posix) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index c876e16..021d206 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -178,7 +178,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-core.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..09ef871 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 qdev-core.o qdev-properties.o common-obj-y = $(qom-obj-twice-y) user-obj-y = $(qom-obj-twice-y) diff --git a/hw/qdev-core.c b/qom/qdev-core.c similarity index 100% rename from hw/qdev-core.c rename to qom/qdev-core.c diff --git a/hw/qdev-properties.c b/qom/qdev-properties.c similarity index 100% rename from hw/qdev-properties.c rename to qom/qdev-properties.c -- 1.7.11.4
