From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWl4d-0004xM-MY for qemu-devel@nongnu.org; Wed, 24 Sep 2014 07:49:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XWl4X-0006AT-HK for qemu-devel@nongnu.org; Wed, 24 Sep 2014 07:49:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58957) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWl4X-00068k-A2 for qemu-devel@nongnu.org; Wed, 24 Sep 2014 07:49:25 -0400 From: Igor Mammedov Date: Wed, 24 Sep 2014 11:48:08 +0000 Message-Id: <1411559299-19042-20-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 19/30] s390x: convert s390-virtio to hotplug handler API 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 Signed-off-by: Igor Mammedov --- hw/s390x/s390-virtio-bus.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index 6b6fb61..97a907c 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -102,7 +102,7 @@ VirtIOS390Bus *s390_virtio_bus_init(ram_addr_t *ram_size) bus->next_ring = bus->dev_page + TARGET_PAGE_SIZE; /* Enable hotplugging */ - _bus->allow_hotplug = 1; + qbus_set_hotplug_handler(_bus, dev, &error_abort); /* Allocate RAM for VirtIO device pages (descriptors, queues, rings) */ *ram_size += S390_DEVICE_PAGES * TARGET_PAGE_SIZE; @@ -597,11 +597,12 @@ static void s390_virtio_busdev_reset(DeviceState *dev) static void virtio_s390_device_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); + HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass); dc->init = s390_virtio_busdev_init; dc->bus_type = TYPE_S390_VIRTIO_BUS; - dc->unplug = qdev_simple_unplug_cb; dc->reset = s390_virtio_busdev_reset; + hc->unplug = qdev_simple_device_unplug_cb; } static const TypeInfo virtio_s390_device_info = { @@ -611,6 +612,10 @@ static const TypeInfo virtio_s390_device_info = { .class_init = virtio_s390_device_class_init, .class_size = sizeof(VirtIOS390DeviceClass), .abstract = true, + .interfaces = (InterfaceInfo[]) { + { TYPE_HOTPLUG_HANDLER }, + { } + } }; static Property s390_virtio_scsi_properties[] = { @@ -674,8 +679,10 @@ static int s390_virtio_bridge_init(SysBusDevice *dev) static void s390_virtio_bridge_class_init(ObjectClass *klass, void *data) { SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass); k->init = s390_virtio_bridge_init; + hc->unplug = qdev_simple_device_unplug_cb; } static const TypeInfo s390_virtio_bridge_info = { @@ -683,6 +690,10 @@ static const TypeInfo s390_virtio_bridge_info = { .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(SysBusDevice), .class_init = s390_virtio_bridge_class_init, + .interfaces = (InterfaceInfo[]) { + { TYPE_HOTPLUG_HANDLER }, + { } + } }; /* virtio-s390-bus */ @@ -691,13 +702,11 @@ static void virtio_s390_bus_new(VirtioBusState *bus, size_t bus_size, VirtIOS390Device *dev) { DeviceState *qdev = DEVICE(dev); - BusState *qbus; char virtio_bus_name[] = "virtio-bus"; qbus_create_inplace(bus, bus_size, TYPE_VIRTIO_S390_BUS, qdev, virtio_bus_name); - qbus = BUS(bus); - qbus->allow_hotplug = 1; + qbus_set_hotplug_handler(BUS(bus), qdev, &error_abort); } static void virtio_s390_bus_class_init(ObjectClass *klass, void *data) -- 1.8.3.1