diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-07-15 13:48:24 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-07-16 17:28:53 -0500 |
| commit | d6beee993810b80d7a7f51d05d4f8e08e485b2b2 (patch) | |
| tree | b8ec4a98abb8f5a95e8d1ef6850d76a4822efa9a | |
| parent | eb54b6dcb8c6795c3667bcf1cb142639a36fdf85 (diff) | |
| download | focaccia-qemu-d6beee993810b80d7a7f51d05d4f8e08e485b2b2.tar.gz focaccia-qemu-d6beee993810b80d7a7f51d05d4f8e08e485b2b2.zip | |
qdev/compat: virtio-console-pci 0.10 compatibility.
Add class property to virtio-console-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 <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/pc.c | 4 | ||||
| -rw-r--r-- | hw/virtio-pci.c | 17 |
2 files changed, 20 insertions, 1 deletions
diff --git a/hw/pc.c b/hw/pc.c index ba1f3d5ef8..8a1582c2e9 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1529,6 +1529,10 @@ static QEMUMachine pc_machine_v0_10 = { .driver = "virtio-blk-pci", .property = "class", .value = stringify(PCI_CLASS_STORAGE_OTHER), + },{ + .driver = "virtio-console-pci", + .property = "class", + .value = stringify(PCI_CLASS_DISPLAY_OTHER), }, { /* end of list */ } }, diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index b135fcc0f2..1afc425a1c 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -465,7 +465,14 @@ static void virtio_console_init_pci_with_class(PCIDevice *pci_dev, static void virtio_console_init_pci(PCIDevice *pci_dev) { - virtio_console_init_pci_with_class(pci_dev, PCI_CLASS_SERIAL_OTHER); + VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); + + if (proxy->class_code != PCI_CLASS_COMMUNICATION_OTHER && + proxy->class_code != PCI_CLASS_DISPLAY_OTHER && /* qemu 0.10 */ + proxy->class_code != PCI_CLASS_OTHERS) /* qemu-kvm */ + proxy->class_code = PCI_CLASS_COMMUNICATION_OTHER; + + virtio_console_init_pci_with_class(pci_dev, proxy->class_code); } static void virtio_console_init_pci_0_10(PCIDevice *pci_dev) @@ -520,6 +527,14 @@ static PCIDeviceInfo virtio_info[] = { .qdev.name = "virtio-console-pci", .qdev.size = sizeof(VirtIOPCIProxy), .init = virtio_console_init_pci, + .qdev.props = (Property[]) { + { + .name = "class", + .info = &qdev_prop_hex32, + .offset = offsetof(VirtIOPCIProxy, class_code), + }, + {/* end of list */} + }, },{ .qdev.name = "virtio-balloon-pci", .qdev.size = sizeof(VirtIOPCIProxy), |