Il 24/09/2014 13:48, Igor Mammedov ha scritto: > Bus by default is not hotpluggable. > virtio-mmio-bus and its parent types do not set allow_hotplug > anywhere explicitly, so remove not needed field access > and wrapper along with it. > > Signed-off-by: Igor Mammedov <imamm...@redhat.com> > --- > hw/virtio/virtio-mmio.c | 17 ++--------------- > 1 file changed, 2 insertions(+), 15 deletions(-) > > diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c > index 18c6e5b..2450c13 100644 > --- a/hw/virtio/virtio-mmio.c > +++ b/hw/virtio/virtio-mmio.c > @@ -89,9 +89,6 @@ typedef struct { > VirtioBusState bus; > } VirtIOMMIOProxy; > > -static void virtio_mmio_bus_new(VirtioBusState *bus, size_t bus_size, > - VirtIOMMIOProxy *dev); > - > static uint64_t virtio_mmio_read(void *opaque, hwaddr offset, unsigned size) > { > VirtIOMMIOProxy *proxy = (VirtIOMMIOProxy *)opaque; > @@ -362,7 +359,8 @@ static void virtio_mmio_realizefn(DeviceState *d, Error > **errp) > VirtIOMMIOProxy *proxy = VIRTIO_MMIO(d); > SysBusDevice *sbd = SYS_BUS_DEVICE(d); > > - virtio_mmio_bus_new(&proxy->bus, sizeof(proxy->bus), proxy); > + qbus_create_inplace(&proxy->bus, sizeof(proxy->bus), > TYPE_VIRTIO_MMIO_BUS, > + d, NULL); > sysbus_init_irq(sbd, &proxy->irq); > memory_region_init_io(&proxy->iomem, OBJECT(d), &virtio_mem_ops, proxy, > TYPE_VIRTIO_MMIO, 0x200); > @@ -393,17 +391,6 @@ static const TypeInfo virtio_mmio_info = { > > /* virtio-mmio-bus. */ > > -static void virtio_mmio_bus_new(VirtioBusState *bus, size_t bus_size, > - VirtIOMMIOProxy *dev) > -{ > - DeviceState *qdev = DEVICE(dev); > - BusState *qbus; > - > - qbus_create_inplace(bus, bus_size, TYPE_VIRTIO_MMIO_BUS, qdev, NULL); > - qbus = BUS(bus); > - qbus->allow_hotplug = 0; > -} > - > static void virtio_mmio_bus_class_init(ObjectClass *klass, void *data) > { > BusClass *bus_class = BUS_CLASS(klass); >
Reviewed-by: Paolo Bonzini <pbonz...@redhat.com>