From: KONRAD Frederic <fred.konrad@xxxxxxxxxxxxx>
Split the old virtio-blk-pci device into virtio-pci and virtio-blk. The old virtio-blk-pci is removed from virtio-pci.c.
Signed-off-by: KONRAD Frederic <fred.konrad@xxxxxxxxxxxxx>
---
hw/virtio-blk.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
hw/virtio-pci.c | 67 -----------------------------------------------
2 files changed, 80 insertions(+), 67 deletions(-)
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index f9c08c0..20953ae 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -720,10 +720,90 @@ static TypeInfo virtio_blkdev_info = {
.instance_size = sizeof(VirtIOBlockState),
.class_init = virtio_blkdev_class_init,
};
+/****************** VirtIOBLK-PCI Device *********************/
+/* This device create a virtio-pci, and a virtio-blk device */
+
+
+static int virtio_blk_pcidev_init(DeviceState *dev)
+{
+ VirtIODevice *vdev;
+ VirtIOBlockState *s = VIRTIO_BLK_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 BLK to Virtio PCI */
+ s->trl = virtio_find_transport_by_device_state(&(vpcidev->qdev));
+
+ vdev = virtio_blk_init(dev, &s->blk);
+ 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_blk_pci_properties[] =
+{
+ DEFINE_BLOCK_PROPERTIES(VirtIOBlockState, blk.conf),
+ DEFINE_BLOCK_CHS_PROPERTIES(VirtIOBlockState, blk.conf),
+ DEFINE_PROP_STRING("serial", VirtIOBlockState, blk.serial),
+#ifdef __linux__
+ DEFINE_PROP_BIT("scsi", VirtIOBlockState, blk.scsi, 0, true),
+#endif
+ DEFINE_PROP_BIT("config-wce", VirtIOBlockState, blk.config_wce, 0, true),
+ DEFINE_VIRTIO_BLK_FEATURES(VirtIOBlockState, host_features),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static void virtio_blk_pci_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+ dc->init = virtio_blk_pcidev_init;
+ dc->props = virtio_blk_pci_properties;
+}
+
+static TypeInfo virtio_blk_pci_info =
+{
+ .name = "virtio-blk-pci",
+ .parent = TYPE_DEVICE,
+ .instance_size = sizeof(VirtIOBlockState),
+ .class_init = virtio_blk_pci_class_init,
+};
+
+/*************************************************************/
static void virtio_blk_register_types(void)
{
type_register_static(&virtio_blkdev_info);
+ type_register_static(&virtio_blk_pci_info);
}
type_init(virtio_blk_register_types)
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index 244df0f..22ee9c2 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -760,26 +760,6 @@ void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev)
proxy->host_features = vdev->get_features(vdev, proxy->host_features);
}
-static int virtio_blk_init_pci(PCIDevice *pci_dev)
-{
- VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
- VirtIODevice *vdev;
-
- if (proxy->class_code != PCI_CLASS_STORAGE_SCSI &&
- proxy->class_code != PCI_CLASS_STORAGE_OTHER)
- proxy->class_code = PCI_CLASS_STORAGE_SCSI;
-
- vdev = virtio_blk_init(&pci_dev->qdev, &proxy->blk);
- if (!vdev) {
- return -1;
- }
- vdev->nvectors = proxy->nvectors;
- virtio_init_pci(proxy, vdev);
- /* make the actual value visible */
- proxy->nvectors = vdev->nvectors;
- return 0;
-}
-
static void virtio_exit_pci(PCIDevice *pci_dev)
{
VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
@@ -788,15 +768,6 @@ static void virtio_exit_pci(PCIDevice *pci_dev)
msix_uninit_exclusive_bar(pci_dev);
}
-static void virtio_blk_exit_pci(PCIDevice *pci_dev)
-{
- VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
-
- virtio_pci_stop_ioeventfd(proxy);
- virtio_blk_exit(proxy->vdev);
- virtio_exit_pci(pci_dev);
-}
-
static int virtio_serial_init_pci(PCIDevice *pci_dev)
{
VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
@@ -855,43 +826,6 @@ static void virtio_balloon_exit_pci(PCIDevice *pci_dev)
virtio_exit_pci(pci_dev);
}
-static Property virtio_blk_properties[] = {
- DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0),
- DEFINE_BLOCK_PROPERTIES(VirtIOPCIProxy, blk.conf),
- DEFINE_BLOCK_CHS_PROPERTIES(VirtIOPCIProxy, blk.conf),
- DEFINE_PROP_STRING("serial", VirtIOPCIProxy, blk.serial),
-#ifdef __linux__
- DEFINE_PROP_BIT("scsi", VirtIOPCIProxy, blk.scsi, 0, true),
-#endif
- DEFINE_PROP_BIT("config-wce", VirtIOPCIProxy, blk.config_wce, 0, true),
- DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
- DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),
- DEFINE_VIRTIO_BLK_FEATURES(VirtIOPCIProxy, host_features),
- DEFINE_PROP_END_OF_LIST(),
-};
-
-static void virtio_blk_class_init(ObjectClass *klass, void *data)
-{
- DeviceClass *dc = DEVICE_CLASS(klass);
- PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
-
- k->init = virtio_blk_init_pci;
- k->exit = virtio_blk_exit_pci;
- k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
- k->device_id = PCI_DEVICE_ID_VIRTIO_BLOCK;
- k->revision = VIRTIO_PCI_ABI_VERSION;
- k->class_id = PCI_CLASS_STORAGE_SCSI;
- dc->reset = virtio_pci_reset;
- dc->props = virtio_blk_properties;
-}
-
-static TypeInfo virtio_blk_info = {
- .name = "virtio-blk-pci",
- .parent = TYPE_PCI_DEVICE,
- .instance_size = sizeof(VirtIOPCIProxy),
- .class_init = virtio_blk_class_init,
-};
-
static Property virtio_serial_properties[] = {
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, DEV_NVECTORS_UNSPECIFIED),
@@ -953,7 +887,6 @@ static TypeInfo virtio_balloon_info = {
static void virtio_pci_register_types(void)
{
- type_register_static(&virtio_blk_info);
type_register_static(&virtio_serial_info);
type_register_static(&virtio_balloon_info);
}
--
1.7.11.7
_______________________________________________
kvmarm mailing list
kvmarm@xxxxxxxxxxxxxxxxxxxxx
https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm
