[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/5] qdev/compat: virtio-blk-pci 0.10 compatibility.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 3/5] qdev/compat: virtio-blk-pci 0.10 compatibility. |
Date: |
Thu, 9 Jul 2009 15:02:31 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/pc.c | 5 +++++
hw/virtio-pci.c | 22 ++++++++++++++--------
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index 6ba6b25..0574283 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1463,6 +1463,11 @@ static QEMUMachine pc_machine_v0_10 = {
.init = pc_init_pci,
.max_cpus = 255,
.compat_props = (CompatProperty[]) {
+ {
+ .driver = "virtio-blk-pci",
+ .property = "class",
+ .value = "0x0180", /* PCI_CLASS_STORAGE_OTHER */
+ },
{ /* end of list */ }
},
};
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index 0b3f41f..3727b0d 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -86,12 +86,7 @@ typedef struct {
PCIDevice pci_dev;
VirtIODevice *vdev;
uint32_t addr;
-
- uint16_t vendor;
- uint16_t device;
- uint16_t subvendor;
- uint16_t class_code;
- uint8_t pif;
+ uint32_t class_code;
} VirtIOPCIProxy;
/* virtio device */
@@ -419,12 +414,15 @@ static void 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);
virtio_init_pci(proxy, vdev,
PCI_VENDOR_ID_REDHAT_QUMRANET,
PCI_DEVICE_ID_VIRTIO_BLOCK,
- PCI_CLASS_STORAGE_OTHER,
- 0x00);
+ proxy->class_code, 0x00);
}
static void virtio_console_init_pci(PCIDevice *pci_dev)
@@ -471,6 +469,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.alias = "virtio",
--
1.6.2.5
[Qemu-devel] [PATCH 1/5] qdev/compat: compat property infrastructure., Gerd Hoffmann, 2009/07/09
[Qemu-devel] [PATCH 2/5] qdev/compat: add pc-0.10 machine type., Gerd Hoffmann, 2009/07/09
[Qemu-devel] [PATCH 4/5] qdev/compat: virtio-balloon-pci 0.10 compatibility., Gerd Hoffmann, 2009/07/09
[Qemu-devel] [PATCH 5/5] qdev/compat: virtio-net-pci 0.10 compatibility., Gerd Hoffmann, 2009/07/09