diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-07-30 04:48:15 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-12-09 21:46:48 +0100 |
| commit | 179b417e17ada41dce4e8112bea0a78a70b6162c (patch) | |
| tree | 8abb7584be890ee5a36bca6607fcb3461aaa1a97 /hw/block | |
| parent | 0f3657ec3664b340ae20b461a7e15dbdac129179 (diff) | |
| download | qemu-179b417e17ada41dce4e8112bea0a78a70b6162c.zip qemu-179b417e17ada41dce4e8112bea0a78a70b6162c.tar.gz qemu-179b417e17ada41dce4e8112bea0a78a70b6162c.tar.bz2 | |
virtio-blk: QOM realize preparations
Rename variable qdev -> dev since that's what realize's argument is called
by convention.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/virtio-blk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 7552ce3..15ce6d3 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -683,8 +683,8 @@ static void virtio_blk_migration_state_changed(Notifier *notifier, void *data) static int virtio_blk_device_init(VirtIODevice *vdev) { - DeviceState *qdev = DEVICE(vdev); - VirtIOBlock *s = VIRTIO_BLK(vdev); + DeviceState *dev = DEVICE(vdev); + VirtIOBlock *s = VIRTIO_BLK(dev); VirtIOBlkConf *blk = &(s->blk); #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE Error *err = NULL; @@ -728,14 +728,14 @@ static int virtio_blk_device_init(VirtIODevice *vdev) #endif s->change = qemu_add_vm_change_state_handler(virtio_blk_dma_restart_cb, s); - register_savevm(qdev, "virtio-blk", virtio_blk_id++, 2, + register_savevm(dev, "virtio-blk", virtio_blk_id++, 2, virtio_blk_save, virtio_blk_load, s); bdrv_set_dev_ops(s->bs, &virtio_block_ops, s); bdrv_set_buffer_alignment(s->bs, s->conf->logical_block_size); bdrv_iostatus_enable(s->bs); - add_boot_device_path(s->conf->bootindex, qdev, "/disk@0,0"); + add_boot_device_path(s->conf->bootindex, dev, "/disk@0,0"); return 0; } |