From: KONRAD Frederic <fred.kon...@greensocs.com> This remove old init and exit function as they are no longer needed. This shouldn't been applyied before virtio-scsi-pci and virtio-scsi-s390 refactoring.
Signed-off-by: KONRAD Frederic <fred.kon...@greensocs.com> --- 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 d81df9c..b2e0d70 100644 --- a/hw/virtio-scsi.c +++ b/hw/virtio-scsi.c @@ -693,35 +693,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; @@ -738,37 +722,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