[Qemu-commits] [COMMIT ab73ff2] qdev/compat: virtio-blk-pci 0.10 compatibility.

[Anthony Liguori]

From: Gerd Hoffmann <address@hidden>

Add class property to virtio-blk-pci allowing to specify the PCI class.
Add compat property to pc-0.10 to set the old PCI class.

Signed-off-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

diff --git a/hw/pc.c b/hw/pc.c
index 64526ec..ba1f3d5 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1525,6 +1525,11 @@ static QEMUMachine pc_machine_v0_10 = {
     .init = pc_init_pci,
     .max_cpus = 255,
     .compat_props = (CompatProperty[]) {
+        {
+            .driver   = "virtio-blk-pci",
+            .property = "class",
+            .value    = stringify(PCI_CLASS_STORAGE_OTHER),
+        },
         { /* end of list */ }
     },
 };
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index 0f676b8..b135fcc 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -86,6 +86,7 @@ typedef struct {
     PCIDevice pci_dev;
     VirtIODevice *vdev;
     uint32_t addr;
+    uint32_t class_code;
 } VirtIOPCIProxy;
 
 /* virtio device */
@@ -435,7 +436,13 @@ static void virtio_blk_init_pci_with_class(PCIDevice 
*pci_dev,
 
 static void virtio_blk_init_pci(PCIDevice *pci_dev)
 {
-    virtio_blk_init_pci_with_class(pci_dev, PCI_CLASS_STORAGE_SCSI);
+    VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
+  
+    if (proxy->class_code != PCI_CLASS_STORAGE_SCSI &&
+        proxy->class_code != PCI_CLASS_STORAGE_OTHER)
+        proxy->class_code = PCI_CLASS_STORAGE_SCSI;
+ 
+    virtio_blk_init_pci_with_class(pci_dev, proxy->class_code);
 }
 
 static void virtio_blk_init_pci_0_10(PCIDevice *pci_dev)
@@ -497,6 +504,14 @@ static PCIDeviceInfo virtio_info[] = {
         .qdev.name = "virtio-blk-pci",
         .qdev.size = sizeof(VirtIOPCIProxy),
         .init      = virtio_blk_init_pci,
+        .qdev.props = (Property[]) {
+            {
+                .name   = "class",
+                .info   = &qdev_prop_hex32,
+                .offset = offsetof(VirtIOPCIProxy, class_code),
+            },
+            {/* end of list */}
+        },
     },{
         .qdev.name = "virtio-net-pci",
         .qdev.size = sizeof(VirtIOPCIProxy),