vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio-blk: Convert to QOM realize 

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
master
Andreas Färber 2013-07-30 01:35:08 +02:00 committed by Paolo Bonzini
parent 59be75227d
commit 75884afd5c
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/block/virtio-blk.c
View File

@ -681,9 +681,9 @@ static void virtio_blk_migration_state_changed(Notifier *notifier, void *data)
} }
#endif /* CONFIG_VIRTIO_BLK_DATA_PLANE */ #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); VirtIOBlock *s = VIRTIO_BLK(dev);
VirtIOBlkConf *blk = &(s->blk); VirtIOBlkConf *blk = &(s->blk);
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
@ -692,18 +692,19 @@ static int virtio_blk_device_init(VirtIODevice *vdev)
static int virtio_blk_id; static int virtio_blk_id;
if (!blk->conf.bs) { if (!blk->conf.bs) {
error_report("drive property not set"); error_setg(errp, "drive property not set");
return -1; return;
} }
if (!bdrv_is_inserted(blk->conf.bs)) { if (!bdrv_is_inserted(blk->conf.bs)) {
error_report("Device needs media, but drive is empty"); error_setg(errp, "Device needs media, but drive is empty");
return -1; return;
} }
blkconf_serial(&blk->conf, &blk->serial); blkconf_serial(&blk->conf, &blk->serial);
s->original_wce = bdrv_enable_write_cache(blk->conf.bs); s->original_wce = bdrv_enable_write_cache(blk->conf.bs);
if (blkconf_geometry(&blk->conf, NULL, 65535, 255, 255) < 0) { 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, 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 #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
virtio_blk_data_plane_create(vdev, blk, &s->dataplane, &err); virtio_blk_data_plane_create(vdev, blk, &s->dataplane, &err);
if (err != NULL) { if (err != NULL) {
error_report("%s", error_get_pretty(err)); error_propagate(errp, err);
error_free(err);
virtio_cleanup(vdev); virtio_cleanup(vdev);
return -1; return;
} }
s->migration_state_notifier.notify = virtio_blk_migration_state_changed; s->migration_state_notifier.notify = virtio_blk_migration_state_changed;
add_migration_state_change_notifier(&s->migration_state_notifier); 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); bdrv_iostatus_enable(s->bs);
add_boot_device_path(s->conf->bootindex, dev, "/disk@0,0"); add_boot_device_path(s->conf->bootindex, dev, "/disk@0,0");
return 0;
} }
static void virtio_blk_device_exit(VirtIODevice *vdev) 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); DeviceClass *dc = DEVICE_CLASS(klass);
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
dc->props = virtio_blk_properties; dc->props = virtio_blk_properties;
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); 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->exit = virtio_blk_device_exit;
vdc->get_config = virtio_blk_update_config; vdc->get_config = virtio_blk_update_config;
vdc->set_config = virtio_blk_set_config; vdc->set_config = virtio_blk_set_config;

4
tests/qdev-monitor-test.c
View File

@ -32,10 +32,8 @@ static void test_device_add(void)
"}}"); "}}");
g_assert(response); g_assert(response);
error = qdict_get_qdict(response, "error"); 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") ?: "", g_assert(!strcmp(qdict_get_try_str(error, "desc") ?: "",
"Device initialization failed.")); "Device needs media, but drive is empty"));
QDECREF(response); QDECREF(response);
/* Delete the drive */ /* Delete the drive */