[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/30] virtio-scsi: QOM realize preparations
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 20/30] virtio-scsi: QOM realize preparations |
Date: |
Mon, 9 Dec 2013 21:48:22 +0100 |
From: Andreas Färber <address@hidden>
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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi/virtio-scsi.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 83344ea..a5b957d 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -594,7 +594,7 @@ int virtio_scsi_common_init(VirtIOSCSICommon *s)
VirtIODevice *vdev = VIRTIO_DEVICE(s);
int i;
- virtio_init(VIRTIO_DEVICE(s), "virtio-scsi", VIRTIO_ID_SCSI,
+ virtio_init(vdev, "virtio-scsi", VIRTIO_ID_SCSI,
sizeof(VirtIOSCSIConfig));
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)
{
- DeviceState *qdev = DEVICE(vdev);
- VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev);
- VirtIOSCSI *s = VIRTIO_SCSI(vdev);
+ DeviceState *dev = DEVICE(vdev);
+ VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(dev);
+ VirtIOSCSI *s = VIRTIO_SCSI(dev);
static int virtio_scsi_id;
Error *err = NULL;
int ret;
@@ -627,10 +627,10 @@ static int virtio_scsi_device_init(VirtIODevice *vdev)
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);
- if (!qdev->hotplugged) {
+ if (!dev->hotplugged) {
scsi_bus_legacy_handle_cmdline(&s->bus, &err);
if (err != NULL) {
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);
return 0;
--
1.8.4.2
- [Qemu-devel] [PULL 10/30] virtio-balloon: switch exit callback to VirtioDeviceClass, (continued)
- [Qemu-devel] [PULL 10/30] virtio-balloon: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 11/30] virtio-rng: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 12/30] virtio-pci: add device_unplugged callback, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 13/30] virtio-blk-dataplane: Improve error reporting, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 14/30] virtio-9p: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 15/30] virtio-blk: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 16/30] virtio-serial: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 17/30] virtio-net: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 18/30] virtio-balloon: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 19/30] virtio-rng: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 20/30] virtio-scsi: QOM realize preparations,
Paolo Bonzini <=
- [Qemu-devel] [PULL 21/30] virtio: Start converting VirtioDevice to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 22/30] virtio-9p: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 23/30] virtio-blk: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 24/30] virtio-serial: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 25/30] virtio-net: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 26/30] virtio-balloon: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 27/30] virtio-rng: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 28/30] virtio-scsi: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 29/30] virtio: Complete converting VirtioDevice to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 30/30] virtio: Convert exit to unrealize, Paolo Bonzini, 2013/12/09