Re: [Xen-devel] [RFC 7/8] include core qdev code into *-user, too

[Eduardo Habkost <ehabkost@xxxxxxxxxx>]

On Tue, Aug 21, 2012 at 05:59:22PM +0100, Peter Maydell wrote:
> On 21 August 2012 16:43, Eduardo Habkost <ehabkost@xxxxxxxxxx> 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@xxxxxxxxxx>
> > ---
> >  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).

-- 
Eduardo

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel