[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/5] qdev/compat: virtio-net-pci 0.10 compatibility.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 5/5] qdev/compat: virtio-net-pci 0.10 compatibility. |
Date: |
Thu, 9 Jul 2009 15:02:33 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/pc.c | 4 ++++
hw/virtio-pci.c | 13 ++++++++++++-
2 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index 0b7c24b..ecb618d 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1471,6 +1471,10 @@ static QEMUMachine pc_machine_v0_10 = {
.driver = "virtio-console-pci",
.property = "class",
.value = "0x0380", /* PCI_CLASS_DISPLAY_OTHER */
+ },{
+ .driver = "virtio-net-pci",
+ .property = "msi",
+ .value = "0",
},
{ /* end of list */ }
},
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index 9e5343d..d284621 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -87,6 +87,7 @@ typedef struct {
VirtIODevice *vdev;
uint32_t addr;
uint32_t class_code;
+ uint32_t msi;
} VirtIOPCIProxy;
/* virtio device */
@@ -387,7 +388,8 @@ static void virtio_init_pci(VirtIOPCIProxy *proxy,
VirtIODevice *vdev,
config[0x3d] = 1;
- if (vdev->nvectors && !msix_init(&proxy->pci_dev, vdev->nvectors, 1, 0)) {
+ if (vdev->nvectors && proxy->msi &&
+ !msix_init(&proxy->pci_dev, vdev->nvectors, 1, 0)) {
pci_register_bar(&proxy->pci_dev, 1,
msix_bar_size(&proxy->pci_dev),
PCI_ADDRESS_SPACE_MEM,
@@ -487,6 +489,15 @@ static PCIDeviceInfo virtio_info[] = {
.qdev.size = sizeof(VirtIOPCIProxy),
.qdev.class = DEV_CLASS_NETWORK,
.init = virtio_net_init_pci,
+ .qdev.props = (Property[]) {
+ {
+ .name = "msi",
+ .info = &qdev_prop_uint32,
+ .offset = offsetof(VirtIOPCIProxy, msi),
+ .defval = (uint32_t[]) { 1 }, /* enabled */
+ },
+ {/* end of list */}
+ },
},{
.qdev.name = "virtio-console-pci",
.qdev.size = sizeof(VirtIOPCIProxy),
--
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 <=