[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 23/30] virtio-blk: Convert to QOM realize
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 23/30] virtio-blk: Convert to QOM realize |
Date: |
Fri, 29 Nov 2013 11:17:35 +0100 |
From: Andreas Färber <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/block/virtio-blk.c | 24 ++++++++++++------------
tests/qdev-monitor-test.c | 4 +---
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 15ce6d3..cb29fdb 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -681,9 +681,9 @@ static void virtio_blk_migration_state_changed(Notifier
*notifier, void *data)
}
#endif /* CONFIG_VIRTIO_BLK_DATA_PLANE */
-static int virtio_blk_device_init(VirtIODevice *vdev)
+static void virtio_blk_device_realize(DeviceState *dev, Error **errp)
{
- DeviceState *dev = DEVICE(vdev);
+ VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIOBlock *s = VIRTIO_BLK(dev);
VirtIOBlkConf *blk = &(s->blk);
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
@@ -692,18 +692,19 @@ static int virtio_blk_device_init(VirtIODevice *vdev)
static int virtio_blk_id;
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;
}
blkconf_serial(&blk->conf, &blk->serial);
s->original_wce = bdrv_enable_write_cache(blk->conf.bs);
if (blkconf_geometry(&blk->conf, NULL, 65535, 255, 255) < 0) {
- return -1;
+ error_setg(errp, "Error setting geometry");
+ return;
}
virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK,
@@ -718,10 +719,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 != 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 = virtio_blk_migration_state_changed;
add_migration_state_change_notifier(&s->migration_state_notifier);
@@ -736,7 +736,6 @@ static int virtio_blk_device_init(VirtIODevice *vdev)
bdrv_iostatus_enable(s->bs);
add_boot_device_path(s->conf->bootindex, dev, "/address@hidden,0");
- return 0;
}
static void virtio_blk_device_exit(VirtIODevice *vdev)
@@ -762,9 +761,10 @@ static void virtio_blk_class_init(ObjectClass *klass, void
*data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
+
dc->props = virtio_blk_properties;
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
- vdc->init = virtio_blk_device_init;
+ vdc->realize = virtio_blk_device_realize;
vdc->exit = virtio_blk_device_exit;
vdc->get_config = virtio_blk_update_config;
vdc->set_config = virtio_blk_set_config;
diff --git a/tests/qdev-monitor-test.c b/tests/qdev-monitor-test.c
index 33a8ea4..ba7f9cc 100644
--- a/tests/qdev-monitor-test.c
+++ b/tests/qdev-monitor-test.c
@@ -32,10 +32,8 @@ static void test_device_add(void)
"}}");
g_assert(response);
error = qdict_get_qdict(response, "error");
- g_assert(!strcmp(qdict_get_try_str(error, "class") ?: "",
- "GenericError"));
g_assert(!strcmp(qdict_get_try_str(error, "desc") ?: "",
- "Device initialization failed."));
+ "Device needs media, but drive is empty"));
QDECREF(response);
/* Delete the drive */
--
1.8.3.1
- [Qemu-devel] [PATCH 13/30] virtio-blk-dataplane: Improve error reporting, (continued)
- [Qemu-devel] [PATCH 13/30] virtio-blk-dataplane: Improve error reporting, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 14/30] virtio-9p: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 15/30] virtio-blk: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 16/30] virtio-serial: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 17/30] virtio-net: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 18/30] virtio-balloon: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 19/30] virtio-rng: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 20/30] virtio-scsi: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 21/30] virtio: Start converting VirtioDevice to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 22/30] virtio-9p: Convert to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 23/30] virtio-blk: Convert to QOM realize,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 24/30] virtio-serial: Convert to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 25/30] virtio-net: Convert to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 26/30] virtio-balloon: Convert to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 27/30] virtio-rng: Convert to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 28/30] virtio-scsi: Convert to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 29/30] virtio: Complete converting VirtioDevice to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 30/30] virtio: Convert exit to unrealize, Paolo Bonzini, 2013/11/29