| Message ID | 1345563782-11224-8-git-send-email-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 21 August 2012 16:43, Eduardo Habkost <ehabkost@redhat.com> wrote: > 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 <ehabkost@redhat.com> > --- > 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 qemu-option.c isn't actually QOM related code... -- PMM
On Tue, Aug 21, 2012 at 05:59:22PM +0100, Peter Maydell wrote: > On 21 August 2012 16:43, Eduardo Habkost <ehabkost@redhat.com> wrote: > > 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 <ehabkost@redhat.com> > > --- > > 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 > > qemu-option.c isn't actually QOM related code... True, but it's a dependency of the QOM DeviceState code. I don't know if qom-obj-y is for "the QOM code" or "QOM code + dependencies". I simply added it to qom-obj-y to avoid having to repeat myself (otherwise I would need to add qemu-option.o to both common-obj-y and user-obj-y).
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)
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 <ehabkost@redhat.com> --- 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/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