From: KONRAD Frederic <fred.konrad@xxxxxxxxxxxxx>
Split the old virtio-scsi-pci device into virtio-pci and virtio-scsi. The old virtio-scsi-pci is removed from virtio-pci.c.
Signed-off-by: KONRAD Frederic <fred.konrad@xxxxxxxxxxxxx>
---
hw/virtio-pci.c | 59 --------------------------------------------
hw/virtio-scsi.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+), 59 deletions(-)
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index 400f3c2..950ddd7 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -21,7 +21,6 @@
#include "virtio-blk.h"
#include "virtio-net.h"
#include "virtio-serial.h"
-#include "virtio-scsi.h"
#include "pci.h"
#include "qemu-error.h"
#include "msi.h"
@@ -1010,70 +1009,12 @@ static TypeInfo virtio_balloon_info = {
.class_init = virtio_balloon_class_init,
};
-static int virtio_scsi_init_pci(PCIDevice *pci_dev)
-{
- VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
- VirtIODevice *vdev;
-
- vdev = virtio_scsi_init(&pci_dev->qdev, &proxy->scsi);
- if (!vdev) {
- return -EINVAL;
- }
-
- vdev->nvectors = proxy->nvectors == DEV_NVECTORS_UNSPECIFIED
- ? proxy->scsi.num_queues + 3
- : proxy->nvectors;
- virtio_init_pci(proxy, vdev);
-
- /* make the actual value visible */
- proxy->nvectors = vdev->nvectors;
- return 0;
-}
-
-static void virtio_scsi_exit_pci(PCIDevice *pci_dev)
-{
- VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
-
- virtio_scsi_exit(proxy->vdev);
- virtio_exit_pci(pci_dev);
-}
-
-static Property virtio_scsi_properties[] = {
- DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
- DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, DEV_NVECTORS_UNSPECIFIED),
- DEFINE_VIRTIO_SCSI_PROPERTIES(VirtIOPCIProxy, host_features, scsi),
- DEFINE_PROP_END_OF_LIST(),
-};
-
-static void virtio_scsi_class_init(ObjectClass *klass, void *data)
-{
- DeviceClass *dc = DEVICE_CLASS(klass);
- PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
-
- k->init = virtio_scsi_init_pci;
- k->exit = virtio_scsi_exit_pci;
- k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
- k->device_id = PCI_DEVICE_ID_VIRTIO_SCSI;
- k->revision = 0x00;
- k->class_id = PCI_CLASS_STORAGE_SCSI;
- dc->reset = virtio_pci_reset;
- dc->props = virtio_scsi_properties;
-}
-
-static TypeInfo virtio_scsi_info = {
- .name = "virtio-scsi-pci",
- .parent = TYPE_PCI_DEVICE,
- .instance_size = sizeof(VirtIOPCIProxy),
- .class_init = virtio_scsi_class_init,
-};
-
static void virtio_pci_register_types(void)
{
type_register_static(&virtio_blk_info);
type_register_static(&virtio_net_info);
type_register_static(&virtio_serial_info);
type_register_static(&virtio_balloon_info);
- type_register_static(&virtio_scsi_info);
}
type_init(virtio_pci_register_types)
diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c
index 9940a963..a02d067 100644
--- a/hw/virtio-scsi.c
+++ b/hw/virtio-scsi.c
@@ -796,9 +796,83 @@ static TypeInfo virtio_scsi_info = {
.class_init = virtio_scsi_class_init,
};
+/****************** VirtIOSCSI-PCI Device ********************/
+/* This device create a virtio-pci, and a virtio-scsi device */
+
+
+static int virtio_scsi_pcidev_init(DeviceState *dev)
+{
+ VirtIODevice *vdev;
+ VirtIOSCSIState *s = VIRTIO_SCSI_FROM_QDEV(dev);
+ PCIBus *rootpcibus;
+ PCIDevice *vpcidev;
+
+ /* We have to create a new virtio-pci */
+ rootpcibus = pci_find_root_bus(0);
+ if (rootpcibus==NULL)
+ {
+ /* No PCI BUS ? */
+ return -1;
+ }
+
+ vpcidev = pci_create_simple(rootpcibus, -1, "virtio-pci");
+ if (vpcidev==NULL)
+ {
+ return -1;
+ }
+
+ /* Link Virtio SCSI to Virtio PCI */
+ s->trl = virtio_find_transport_by_device_state(&(vpcidev->qdev));
+
+ vdev = virtio_scsi_init(dev, &s->scsi);
+ if (!vdev)
+ {
+ return -1;
+ }
+
+ /* Pass default host_features to transport */
+ s->trl->host_features = s->host_features;
+
+ if (virtio_call_backend_init_cb(dev, s->trl, vdev) != 0)
+ {
+ return -1;
+ }
+
+ /* Binding should be ready here, let's get final features */
+ if (vdev->binding->get_features)
+ {
+ s->host_features = vdev->binding->get_features(vdev->binding_opaque);
+ }
+ return 0;
+}
+
+static Property virtio_scsi_pci_properties[] =
+{
+ DEFINE_VIRTIO_SCSI_PROPERTIES(VirtIOSCSIState, host_features, scsi),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static void virtio_scsi_pci_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+ dc->init = virtio_scsi_pcidev_init;
+ dc->props = virtio_scsi_pci_properties;
+}
+
+static TypeInfo virtio_scsi_pci_info =
+{
+ .name = "virtio-scsi-pci",
+ .parent = TYPE_DEVICE,
+ .instance_size = sizeof(VirtIOSCSIState),
+ .class_init = virtio_scsi_pci_class_init,
+};
+
+/*************************************************************/
+
static void virtio_scsi_register_types(void)
{
type_register_static(&virtio_scsi_info);
+ type_register_static(&virtio_scsi_pci_info);
}
type_init(virtio_scsi_register_types)
--
1.7.11.7
_______________________________________________
kvmarm mailing list
kvmarm@xxxxxxxxxxxxxxxxxxxxx
https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm
