virtio: also probe version 1.0 pci ids

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/src/hw/pci_ids.h b/src/hw/pci_ids.h
index 1cd4f72693fa320cab2b0799b8abf5e24bcd9eed..cdf9b3cbc51a39c0120af9ccf06c1409bb33e552 100644 (file)
--- a/src/hw/pci_ids.h
+++ b/src/hw/pci_ids.h
@@ -2616,8 +2616,12 @@
 #define PCI_DEVICE_ID_RME_DIGI32_8     0x9898
 
 #define PCI_VENDOR_ID_REDHAT_QUMRANET  0x1af4
-#define PCI_DEVICE_ID_VIRTIO_BLK       0x1001
-#define PCI_DEVICE_ID_VIRTIO_SCSI      0x1004
+/* virtio 0.9.5 ids (legacy/transitional devices) */
+#define PCI_DEVICE_ID_VIRTIO_BLK_09    0x1001
+#define PCI_DEVICE_ID_VIRTIO_SCSI_09   0x1004
+/* virtio 1.0 ids (modern devices) */
+#define PCI_DEVICE_ID_VIRTIO_BLK_10    0x1042
+#define PCI_DEVICE_ID_VIRTIO_SCSI_10   0x1048
 
 #define PCI_VENDOR_ID_VMWARE        0x15ad
 #define PCI_DEVICE_ID_VMWARE_PVSCSI 0x07C0

diff --git a/src/hw/virtio-blk.c b/src/hw/virtio-blk.c
index 703b147f0f176c656f41063227c83d4bbb13f6b3..c3052bbb24e0907ddcc9a95b1bd0d99de0f3664f 100644 (file)
--- a/src/hw/virtio-blk.c
+++ b/src/hw/virtio-blk.c
@@ -216,8 +216,9 @@ virtio_blk_setup(void)
 
     struct pci_device *pci;
     foreachpci(pci) {
-        if (pci->vendor != PCI_VENDOR_ID_REDHAT_QUMRANET
-            || pci->device != PCI_DEVICE_ID_VIRTIO_BLK)
+        if (pci->vendor != PCI_VENDOR_ID_REDHAT_QUMRANET ||
+           (pci->device != PCI_DEVICE_ID_VIRTIO_BLK_09 &&
+            pci->device != PCI_DEVICE_ID_VIRTIO_BLK_10))
             continue;
         init_virtio_blk(pci);
     }

diff --git a/src/hw/virtio-scsi.c b/src/hw/virtio-scsi.c
index 89dcb8db6ba54bafb93684495fffc68bc1e3704c..6b4ed1aca96a67df9634235c38899c2228562515 100644 (file)
--- a/src/hw/virtio-scsi.c
+++ b/src/hw/virtio-scsi.c
@@ -207,8 +207,9 @@ virtio_scsi_setup(void)
 
     struct pci_device *pci;
     foreachpci(pci) {
-        if (pci->vendor != PCI_VENDOR_ID_REDHAT_QUMRANET
-            || pci->device != PCI_DEVICE_ID_VIRTIO_SCSI)
+        if (pci->vendor != PCI_VENDOR_ID_REDHAT_QUMRANET ||
+            (pci->device != PCI_DEVICE_ID_VIRTIO_SCSI_09 &&
+             pci->device != PCI_DEVICE_ID_VIRTIO_SCSI_10))
             continue;
         init_virtio_scsi(pci);
     }