From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWl4T-0004fH-Pv for qemu-devel@nongnu.org; Wed, 24 Sep 2014 07:49:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XWl4N-00067q-LN for qemu-devel@nongnu.org; Wed, 24 Sep 2014 07:49:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62704) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWl4N-000673-Dr for qemu-devel@nongnu.org; Wed, 24 Sep 2014 07:49:15 -0400 From: Igor Mammedov Date: Wed, 24 Sep 2014 11:48:04 +0000 Message-Id: <1411559299-19042-16-git-send-email-imammedo@redhat.com> In-Reply-To: <1411559299-19042-1-git-send-email-imammedo@redhat.com> References: <1411559299-19042-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 15/30] virtio-pci: replace BusState.allow_hotplug with hotplug_handler List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dmitry@daynix.com, borntraeger@de.ibm.com, mst@redhat.com, agraf@suse.de, cornelia.huck@de.ibm.com, kraxel@redhat.com, amit.shah@redhat.com, pbonzini@redhat.com, rth@twiddle.net Although virtio-pci-bus is internal object of composite virtio-pci device and it doesn't participate in -device/device_add hotplug flow, it's required by bus_add_child() that bus must be hotpluggable to be able to add child at runtime. Set parent of virtio-pci-bus as NOP hotplug controller, so that bus_add_child() would allow to add child device during hotplug time when BusState.allow_hotplug is dropped. Signed-off-by: Igor Mammedov --- hw/virtio/virtio-pci.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index f560814..0486b25 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1070,6 +1070,10 @@ static const TypeInfo virtio_pci_info = { .class_init = virtio_pci_class_init, .class_size = sizeof(VirtioPCIClass), .abstract = true, + .interfaces = (InterfaceInfo[]) { + { TYPE_HOTPLUG_HANDLER }, + { } + } }; /* virtio-blk-pci */ @@ -1543,13 +1547,11 @@ static void virtio_pci_bus_new(VirtioBusState *bus, size_t bus_size, VirtIOPCIProxy *dev) { DeviceState *qdev = DEVICE(dev); - BusState *qbus; char virtio_bus_name[] = "virtio-bus"; qbus_create_inplace(bus, bus_size, TYPE_VIRTIO_PCI_BUS, qdev, virtio_bus_name); - qbus = BUS(bus); - qbus->allow_hotplug = 1; + qbus_set_hotplug_handler(BUS(bus), qdev, &error_abort); } static void virtio_pci_bus_class_init(ObjectClass *klass, void *data) -- 1.8.3.1