Re: [Qemu-devel] [RFC 11/15] s390x: Initialize default bus lists

[Eduardo Habkost]

On Mon, Dec 05, 2016 at 05:03:27PM +0100, Cornelia Huck wrote:
> On Mon, 5 Dec 2016 16:24:00 +0100
> David Hildenbrand <address@hidden> wrote:
> 
> > Am 22.11.2016 um 02:12 schrieb Eduardo Habkost:
> > > Populate the default_bus_types list for the s390x machines. This
> > > will allow qmp-machine-info.py to run in strict mode for s390x.
> > >
> > > Signed-off-by: Eduardo Habkost <address@hidden>
> > > ---
> > >  hw/s390x/s390-virtio-ccw.c | 6 ++++++
> > >  tests/qmp-machine-info.py  | 2 +-
> > >  2 files changed, 7 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> > > index e340eab..2532fcb 100644
> > > --- a/hw/s390x/s390-virtio-ccw.c
> > > +++ b/hw/s390x/s390-virtio-ccw.c
> > > @@ -206,6 +206,12 @@ static void ccw_machine_class_init(ObjectClass *oc, 
> > > void *data)
> > >      mc->use_sclp = 1;
> > >      mc->max_cpus = 248;
> > >      mc->get_hotplug_handler = s390_get_hotplug_handler;
> > > +    machine_class_add_default_bus(mc, TYPE_VIRTUAL_CSS_BUS);
> > > +    machine_class_add_default_bus(mc, TYPE_PCI_BUS);
> > > +    machine_class_add_default_bus(mc, TYPE_S390_PCI_BUS);
> > > +    machine_class_add_default_bus(mc, "s390-sclp-events-bus");
> > > +    machine_class_add_default_bus(mc, TYPE_VIRTIO_BUS);
> > > +
> > 
> > Maybe move and use
> > #define TYPE_SCLP_EVENTS_BUS "s390-sclp-events-bus"
> > 
> > (maybe this should then become TYPE_S390_SCLP_EVENTS_BUS ...)
> > 
> > ?
> > 
> 
> I'd ack/take such a patch.

Agreed. I will address that in final version. This version was
supposed to include a "//FIXME: use macro here" comment.

-- 
Eduardo