ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio-scsi: QOM realize preparations 

Rename qdev -> dev since that's what realize's argument is called by
convention. No need to keep more "qdev" around than necessary.

Avoid duplicate VIRTIO_DEVICE() cast.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Andreas Färber 2013-07-30 05:41:42 +02:00 committed by Paolo Bonzini
parent af7671fdc5
commit 7598f0f30e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/scsi/virtio-scsi.c
View File

@ -594,7 +594,7 @@ int virtio_scsi_common_init(VirtIOSCSICommon *s)
VirtIODevice *vdev = VIRTIO_DEVICE(s); VirtIODevice *vdev = VIRTIO_DEVICE(s);
int i; int i;
virtio_init(VIRTIO_DEVICE(s), "virtio-scsi", VIRTIO_ID_SCSI, virtio_init(vdev, "virtio-scsi", VIRTIO_ID_SCSI,
sizeof(VirtIOSCSIConfig)); sizeof(VirtIOSCSIConfig));
s->cmd_vqs = g_malloc0(s->conf.num_queues * sizeof(VirtQueue *)); s->cmd_vqs = g_malloc0(s->conf.num_queues * sizeof(VirtQueue *));
@ -615,9 +615,9 @@ int virtio_scsi_common_init(VirtIOSCSICommon *s)
static int virtio_scsi_device_init(VirtIODevice *vdev) static int virtio_scsi_device_init(VirtIODevice *vdev)
{ {
DeviceState *qdev = DEVICE(vdev); DeviceState *dev = DEVICE(vdev);
VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev); VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(dev);
VirtIOSCSI *s = VIRTIO_SCSI(vdev); VirtIOSCSI *s = VIRTIO_SCSI(dev);
static int virtio_scsi_id; static int virtio_scsi_id;
Error *err = NULL; Error *err = NULL;
int ret; int ret;
@ -627,10 +627,10 @@ static int virtio_scsi_device_init(VirtIODevice *vdev)
return ret; return ret;
} }
scsi_bus_new(&s->bus, sizeof(s->bus), qdev, scsi_bus_new(&s->bus, sizeof(s->bus), dev,
&virtio_scsi_scsi_info, vdev->bus_name); &virtio_scsi_scsi_info, vdev->bus_name);
if (!qdev->hotplugged) { if (!dev->hotplugged) {
scsi_bus_legacy_handle_cmdline(&s->bus, &err); scsi_bus_legacy_handle_cmdline(&s->bus, &err);
if (err != NULL) { if (err != NULL) {
error_free(err); error_free(err);
@ -638,7 +638,7 @@ static int virtio_scsi_device_init(VirtIODevice *vdev)
} }
} }
register_savevm(qdev, "virtio-scsi", virtio_scsi_id++, 1, register_savevm(dev, "virtio-scsi", virtio_scsi_id++, 1,
virtio_scsi_save, virtio_scsi_load, s); virtio_scsi_save, virtio_scsi_load, s);
return 0; return 0;