ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change default PCI class of virtio-blk to PCI_CLASS_STORAGE_SCSI 

Windows virtio driver cannot pass DTM (certification) tests while the
storage class is PCI_CLASS_STORAGE_UNKNOWN.

A new qdev type is introduced to allow devices using the old class
to be created for compatibility with qemu-0.10.x.

Reported-by: Dor Laor <dlaor@redhat.com>
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Mark McLoughlin 2009-07-07 12:09:10 +01:00 committed by Anthony Liguori
parent 6f6260c7d6
commit 5c634ef30d
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/virtio-pci.c
View File

@ -426,7 +426,8 @@ static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev,
virtio_bind_device(vdev, &virtio_pci_bindings, proxy); virtio_bind_device(vdev, &virtio_pci_bindings, proxy);
} }
static void virtio_blk_init_pci(PCIDevice *pci_dev) static void virtio_blk_init_pci_with_class(PCIDevice *pci_dev,
uint16_t class_code)
{ {
VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
VirtIODevice *vdev; VirtIODevice *vdev;
@ -435,8 +436,17 @@ static void virtio_blk_init_pci(PCIDevice *pci_dev)
virtio_init_pci(proxy, vdev, virtio_init_pci(proxy, vdev,
PCI_VENDOR_ID_REDHAT_QUMRANET, PCI_VENDOR_ID_REDHAT_QUMRANET,
PCI_DEVICE_ID_VIRTIO_BLOCK, PCI_DEVICE_ID_VIRTIO_BLOCK,
PCI_CLASS_STORAGE_OTHER, class_code, 0x00);
0x00); }
static void virtio_blk_init_pci(PCIDevice *pci_dev)
{
virtio_blk_init_pci_with_class(pci_dev, PCI_CLASS_STORAGE_SCSI);
}
static void virtio_blk_init_pci_0_10(PCIDevice *pci_dev)
{
virtio_blk_init_pci_with_class(pci_dev, PCI_CLASS_STORAGE_OTHER);
} }
static void virtio_console_init_pci(PCIDevice *pci_dev) static void virtio_console_init_pci(PCIDevice *pci_dev)
@ -495,6 +505,11 @@ static PCIDeviceInfo virtio_info[] = {
.qdev.name = "virtio-balloon-pci", .qdev.name = "virtio-balloon-pci",
.qdev.size = sizeof(VirtIOPCIProxy), .qdev.size = sizeof(VirtIOPCIProxy),
.init = virtio_balloon_init_pci, .init = virtio_balloon_init_pci,
},{
/* For compatibility with 0.10 */
.qdev.name = "virtio-blk-pci-0-10",
.qdev.size = sizeof(VirtIOPCIProxy),
.init = virtio_blk_init_pci_0_10,
},{ },{
/* end of list */ /* end of list */
} }