From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4iSn-0003Px-Tu for qemu-devel@nongnu.org; Wed, 31 Jul 2013 22:18:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4iSg-0006IZ-N2 for qemu-devel@nongnu.org; Wed, 31 Jul 2013 22:18:01 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60983 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4iSg-0006IH-DZ for qemu-devel@nongnu.org; Wed, 31 Jul 2013 22:17:54 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 1 Aug 2013 04:17:30 +0200 Message-Id: <1375323463-32747-10-git-send-email-afaerber@suse.de> In-Reply-To: <1375323463-32747-1-git-send-email-afaerber@suse.de> References: <1375323463-32747-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] [PATCH for-next v2 09/22] virtio-blk: Convert to QOM realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Stefan Hajnoczi Signed-off-by: Andreas F=C3=A4rber --- hw/block/virtio-blk.c | 32 +++++++++++++++++--------------- include/hw/virtio/virtio-blk.h | 2 ++ 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 9efc8b7..18fb020 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -662,28 +662,30 @@ static void virtio_blk_migration_state_changed(Noti= fier *notifier, void *data) } #endif /* CONFIG_VIRTIO_BLK_DATA_PLANE */ =20 -static int virtio_blk_device_init(VirtIODevice *vdev) +static void virtio_blk_device_realize(DeviceState *dev, Error **errp) { - DeviceState *dev =3D DEVICE(vdev); + VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); VirtIOBlock *s =3D VIRTIO_BLK(dev); VirtIOBlkConf *blk =3D &(s->blk); + DeviceClass *parent_dc =3D DEVICE_CLASS(VIRTIO_BLK_GET_PARENT_CLASS(= dev)); #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE Error *err =3D NULL; #endif static int virtio_blk_id; =20 if (!blk->conf.bs) { - error_report("drive property not set"); - return -1; + error_setg(errp, "drive property not set"); + return; } if (!bdrv_is_inserted(blk->conf.bs)) { - error_report("Device needs media, but drive is empty"); - return -1; + error_setg(errp, "Device needs media, but drive is empty"); + return; } =20 blkconf_serial(&blk->conf, &blk->serial); if (blkconf_geometry(&blk->conf, NULL, 65535, 255, 255) < 0) { - return -1; + error_setg(errp, "Error setting geometry"); + return; } =20 virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK, @@ -699,10 +701,9 @@ static int virtio_blk_device_init(VirtIODevice *vdev= ) #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE virtio_blk_data_plane_create(vdev, blk, &s->dataplane, &err); if (err !=3D NULL) { - error_report("%s", error_get_pretty(err)); - error_free(err); + error_propagate(errp, err); virtio_cleanup(vdev); - return -1; + return; } s->migration_state_notifier.notify =3D virtio_blk_migration_state_ch= anged; add_migration_state_change_notifier(&s->migration_state_notifier); @@ -717,10 +718,11 @@ static int virtio_blk_device_init(VirtIODevice *vde= v) bdrv_iostatus_enable(s->bs); =20 add_boot_device_path(s->conf->bootindex, dev, "/disk@0,0"); - return 0; + + parent_dc->realize(dev, errp); } =20 -static int virtio_blk_device_exit(DeviceState *dev) +static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp) { VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); VirtIOBlock *s =3D VIRTIO_BLK(dev); @@ -733,7 +735,6 @@ static int virtio_blk_device_exit(DeviceState *dev) unregister_savevm(dev, "virtio-blk", s); blockdev_mark_auto_del(s->bs); virtio_cleanup(vdev); - return 0; } =20 static Property virtio_blk_properties[] =3D { @@ -745,10 +746,11 @@ static void virtio_blk_class_init(ObjectClass *klas= s, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); VirtioDeviceClass *vdc =3D VIRTIO_DEVICE_CLASS(klass); - dc->exit =3D virtio_blk_device_exit; + + dc->realize =3D virtio_blk_device_realize; + dc->unrealize =3D virtio_blk_device_unrealize; dc->props =3D virtio_blk_properties; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); - vdc->init =3D virtio_blk_device_init; vdc->get_config =3D virtio_blk_update_config; vdc->set_config =3D virtio_blk_set_config; vdc->get_features =3D virtio_blk_get_features; diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-bl= k.h index b87cf49..201531d 100644 --- a/include/hw/virtio/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -20,6 +20,8 @@ #define TYPE_VIRTIO_BLK "virtio-blk-device" #define VIRTIO_BLK(obj) \ OBJECT_CHECK(VirtIOBlock, (obj), TYPE_VIRTIO_BLK) +#define VIRTIO_BLK_GET_PARENT_CLASS(obj) \ + OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_BLK) =20 /* from Linux's linux/virtio_blk.h */ =20 --=20 1.8.1.4