david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio-serial: pci: Allow MSI to be disabled

Browse Source 
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>
This commit is contained in:
Amit Shah 2010-02-12 18:52:38 +05:30 committed by Anthony Liguori
parent ee4d45be0d
commit 7b665b668a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/virtio-pci.c
View File

@ -500,8 +500,8 @@ static int virtio_serial_init_pci(PCIDevice *pci_dev)
if (!vdev) { if (!vdev) {
return -1; return -1;
} }
vdev->nvectors = proxy->nvectors ? proxy->nvectors vdev->nvectors = proxy->nvectors == -1 ? proxy->max_virtserial_ports + 1
: proxy->max_virtserial_ports + 1; : proxy->nvectors;
virtio_init_pci(proxy, vdev, virtio_init_pci(proxy, vdev,
PCI_VENDOR_ID_REDHAT_QUMRANET, PCI_VENDOR_ID_REDHAT_QUMRANET,
PCI_DEVICE_ID_VIRTIO_CONSOLE, PCI_DEVICE_ID_VIRTIO_CONSOLE,
@ -585,7 +585,7 @@ static PCIDeviceInfo virtio_info[] = {
.init = virtio_serial_init_pci, .init = virtio_serial_init_pci,
.exit = virtio_exit_pci, .exit = virtio_exit_pci,
.qdev.props = (Property[]) { .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_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0),
DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features), DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features),
DEFINE_PROP_UINT32("max_ports", VirtIOPCIProxy, max_virtserial_ports, DEFINE_PROP_UINT32("max_ports", VirtIOPCIProxy, max_virtserial_ports,