diff options
| author | Amit Shah <amit.shah@redhat.com> | 2010-02-12 18:52:38 +0530 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-02-19 15:32:16 -0600 |
| commit | 7b665b668aa92bf0bba696f085dff87539d95529 (patch) | |
| tree | 8e4fa5c15082fd6b0088fb88df28bc5e40d53b02 /hw/virtio-pci.c | |
| parent | ee4d45be0d791eb8bb0f767cd0f17ea8f697281b (diff) | |
| download | qemu-7b665b668aa92bf0bba696f085dff87539d95529.zip qemu-7b665b668aa92bf0bba696f085dff87539d95529.tar.gz qemu-7b665b668aa92bf0bba696f085dff87539d95529.tar.bz2 | |
virtio-serial: pci: Allow MSI to be disabled
Michael noted we don't allow disabling of MSI for the virtio-serial-pci
device. Fix that.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
CC: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/virtio-pci.c')
| -rw-r--r-- | hw/virtio-pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index f3373ae..bcd40f7 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -500,8 +500,8 @@ static int virtio_serial_init_pci(PCIDevice *pci_dev) if (!vdev) { return -1; } - vdev->nvectors = proxy->nvectors ? proxy->nvectors - : proxy->max_virtserial_ports + 1; + vdev->nvectors = proxy->nvectors == -1 ? proxy->max_virtserial_ports + 1 + : proxy->nvectors; virtio_init_pci(proxy, vdev, PCI_VENDOR_ID_REDHAT_QUMRANET, PCI_DEVICE_ID_VIRTIO_CONSOLE, @@ -585,7 +585,7 @@ static PCIDeviceInfo virtio_info[] = { .init = virtio_serial_init_pci, .exit = virtio_exit_pci, .qdev.props = (Property[]) { - DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 0), + DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, -1), DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0), DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features), DEFINE_PROP_UINT32("max_ports", VirtIOPCIProxy, max_virtserial_ports, |