From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeEy7-0006B7-VF for qemu-devel@nongnu.org; Tue, 14 Oct 2014 23:09:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XeExy-0004qs-43 for qemu-devel@nongnu.org; Tue, 14 Oct 2014 23:09:43 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49351 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeExx-0004qS-P2 for qemu-devel@nongnu.org; Tue, 14 Oct 2014 23:09:34 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 15 Oct 2014 05:09:04 +0200 Message-Id: <1413342561-4754-31-git-send-email-afaerber@suse.de> In-Reply-To: <1413342561-4754-1-git-send-email-afaerber@suse.de> References: <1413342561-4754-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 30/47] s390x: Convert virtio-ccw to hotplug handler API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Alexander Graf , Christian Borntraeger , Anthony Liguori , Cornelia Huck , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Richard Henderson From: Igor Mammedov Signed-off-by: Igor Mammedov Reviewed-by: Cornelia Huck Reviewed-by: Michael S. Tsirkin Signed-off-by: Andreas F=C3=A4rber --- hw/s390x/virtio-ccw.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 18ba29f..4438b6f 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -230,7 +230,7 @@ VirtualCssBus *virtual_css_bus_init(void) cbus =3D VIRTUAL_CSS_BUS(bus); =20 /* Enable hotplugging */ - bus->allow_hotplug =3D 1; + qbus_set_hotplug_handler(bus, dev, &error_abort); =20 return cbus; } @@ -1590,7 +1590,8 @@ static int virtio_ccw_busdev_exit(DeviceState *dev) return _info->exit(_dev); } =20 -static int virtio_ccw_busdev_unplug(DeviceState *dev) +static void virtio_ccw_busdev_unplug(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) { VirtioCcwDevice *_dev =3D (VirtioCcwDevice *)dev; SubchDev *sch =3D _dev->sch; @@ -1609,7 +1610,6 @@ static int virtio_ccw_busdev_unplug(DeviceState *de= v) css_generate_sch_crws(sch->cssid, sch->ssid, sch->schid, 1, 0); =20 object_unparent(OBJECT(dev)); - return 0; } =20 static Property virtio_ccw_properties[] =3D { @@ -1624,9 +1624,7 @@ static void virtio_ccw_device_class_init(ObjectClas= s *klass, void *data) dc->props =3D virtio_ccw_properties; dc->init =3D virtio_ccw_busdev_init; dc->exit =3D virtio_ccw_busdev_exit; - dc->unplug =3D virtio_ccw_busdev_unplug; dc->bus_type =3D TYPE_VIRTUAL_CSS_BUS; - } =20 static const TypeInfo virtio_ccw_device_info =3D { @@ -1650,8 +1648,10 @@ static int virtual_css_bridge_init(SysBusDevice *d= ev) static void virtual_css_bridge_class_init(ObjectClass *klass, void *data= ) { SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); + HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(klass); =20 k->init =3D virtual_css_bridge_init; + hc->unplug =3D virtio_ccw_busdev_unplug; } =20 static const TypeInfo virtual_css_bridge_info =3D { @@ -1659,6 +1659,10 @@ static const TypeInfo virtual_css_bridge_info =3D = { .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(SysBusDevice), .class_init =3D virtual_css_bridge_class_init, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_HOTPLUG_HANDLER }, + { } + } }; =20 /* virtio-ccw-bus */ @@ -1667,13 +1671,10 @@ static void virtio_ccw_bus_new(VirtioBusState *bu= s, size_t bus_size, VirtioCcwDevice *dev) { DeviceState *qdev =3D DEVICE(dev); - BusState *qbus; char virtio_bus_name[] =3D "virtio-bus"; =20 qbus_create_inplace(bus, bus_size, TYPE_VIRTIO_CCW_BUS, qdev, virtio_bus_name); - qbus =3D BUS(bus); - qbus->allow_hotplug =3D 1; } =20 static void virtio_ccw_bus_class_init(ObjectClass *klass, void *data) --=20 1.8.4.5