[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V3 21/44] virtio-scsi: cleanup: init and exit functi
From: |
fred . konrad |
Subject: |
[Qemu-devel] [PATCH V3 21/44] virtio-scsi: cleanup: init and exit functions. |
Date: |
Tue, 15 Jan 2013 15:09:35 +0100 |
From: KONRAD Frederic <address@hidden>
This remove old init and exit function as they are no longer needed.
Signed-off-by: KONRAD Frederic <address@hidden>
---
hw/virtio-scsi.c | 59 ++++++++++----------------------------------------------
1 file changed, 10 insertions(+), 49 deletions(-)
diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c
index 1c6715c..a47667d 100644
--- a/hw/virtio-scsi.c
+++ b/hw/virtio-scsi.c
@@ -697,35 +697,19 @@ void virtio_scsi_set_conf(DeviceState *qdev,
VirtIOSCSIConf *conf)
memcpy(&(s->conf), conf, sizeof(struct VirtIOSCSIConf));
}
-static VirtIODevice *virtio_scsi_common_init(DeviceState *dev,
- VirtIOSCSIConf *proxyconf,
- VirtIOSCSI **ps)
+static int virtio_scsi_device_init(VirtIODevice *vdev)
{
- VirtIOSCSI *s = *ps;
- VirtIODevice *vdev = VIRTIO_DEVICE(s);
+ DeviceState *qdev = DEVICE(vdev);
+ VirtIOSCSI *s = VIRTIO_SCSI(vdev);
static int virtio_scsi_id;
int i;
- /*
- * We have two cases here: the old virtio-net-pci device, and the
- * refactored virtio-net.
- */
+ virtio_init(VIRTIO_DEVICE(s), "virtio-scsi", VIRTIO_ID_SCSI,
+ sizeof(VirtIOSCSIConfig));
- if (s == NULL) {
- /* virtio-scsi-pci */
- s = (VirtIOSCSI *)virtio_common_init("virtio-scsi", VIRTIO_ID_SCSI,
- sizeof(VirtIOSCSIConfig),
- sizeof(VirtIOSCSI));
- } else {
- /* virtio-scsi */
- virtio_init(VIRTIO_DEVICE(s), "virtio-scsi", VIRTIO_ID_SCSI,
- sizeof(VirtIOSCSIConfig));
- }
+ s->cmd_vqs = g_malloc0(s->conf.num_queues * sizeof(VirtQueue *));
- s->cmd_vqs = g_malloc0(proxyconf->num_queues * sizeof(VirtQueue *));
-
- s->qdev = dev;
- memcpy(&(s->conf), proxyconf, sizeof(struct VirtIOSCSIConf));
+ s->qdev = qdev;
/* TODO set up vdev function pointers */
vdev->get_config = virtio_scsi_get_config;
@@ -742,37 +726,14 @@ static VirtIODevice *virtio_scsi_common_init(DeviceState
*dev,
virtio_scsi_handle_cmd);
}
- scsi_bus_new(&s->bus, dev, &virtio_scsi_scsi_info);
- if (!dev->hotplugged) {
+ scsi_bus_new(&s->bus, qdev, &virtio_scsi_scsi_info);
+ if (!qdev->hotplugged) {
scsi_bus_legacy_handle_cmdline(&s->bus);
}
- register_savevm(dev, "virtio-scsi", virtio_scsi_id++, 1,
+ register_savevm(qdev, "virtio-scsi", virtio_scsi_id++, 1,
virtio_scsi_save, virtio_scsi_load, s);
- return vdev;
-}
-
-VirtIODevice *virtio_scsi_init(DeviceState *dev, VirtIOSCSIConf *proxyconf)
-{
- VirtIOSCSI *s = NULL;
- return virtio_scsi_common_init(dev, proxyconf, &s);
-}
-
-void virtio_scsi_exit(VirtIODevice *vdev)
-{
- VirtIOSCSI *s = (VirtIOSCSI *)vdev;
- unregister_savevm(s->qdev, "virtio-scsi", s);
- virtio_cleanup(vdev);
-}
-
-static int virtio_scsi_device_init(VirtIODevice *vdev)
-{
- DeviceState *qdev = DEVICE(vdev);
- VirtIOSCSI *s = VIRTIO_SCSI(vdev);
- if (virtio_scsi_common_init(qdev, &(s->conf), &s) == NULL) {
- return -1;
- }
return 0;
}
--
1.7.11.7
- [Qemu-devel] [PATCH V3 13/44] virtio-net: cleanup: remove qdev field., (continued)
- [Qemu-devel] [PATCH V3 13/44] virtio-net: cleanup: remove qdev field., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 06/44] virtio-blk: cleanup: use QOM cast., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 36/44] virtio-serial-pci: switch to the new API., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 19/44] virtio-scsi-s390: switch to the new API., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 26/44] virtio-balloon: cleanup: QOM casts., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 34/44] virtio-rng.c: cleanup: use QOM casts., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 27/44] virtio-balloon: cleanup: remove qdev field., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 29/44] virtio-rng: add virtio-rng device., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 42/44] virtio-9p-pci: switch to the new API., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 21/44] virtio-scsi: cleanup: init and exit functions.,
fred . konrad <=
- [Qemu-devel] [PATCH V3 30/44] virtio-rng-s390: switch to the new API., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 35/44] virtio-serial: add the virtio-serial device., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 43/44] virtio-9p: cleanup: init function., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 24/44] virtio-balloon-pci: switch to the new API., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 23/44] virtio-balloon: add the virtio-balloon device., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 28/44] virtio-rng: don't use pointer for configuration., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 25/44] virtio-balloon: cleanup: init and exit function., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 16/44] virtio-scsi: moving host_features from properties to transport properties., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 37/44] virtio-serial-s390: switch to the new API., fred . konrad, 2013/01/15