diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-14 07:59:21 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-14 07:59:21 -0600 |
commit | 9423a2e8dd362a271bfe194ec131062814557b95 (patch) | |
tree | 6b10b2d69e5d81b6ff4cb2ba75693d8a65362d92 /hw/virtio-pci.c | |
parent | da5361cc685c004d8bb4e7c5e7b3a52c7aca2c56 (diff) | |
parent | 126c79133f77d1b0b7c3849899c6d5f83b2fd410 (diff) |
Merge remote-tracking branch 'stefanha/trivial-patches-next' into staging
Diffstat (limited to 'hw/virtio-pci.c')
-rw-r--r-- | hw/virtio-pci.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index c665f5c94b..77b75bcd9a 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -627,9 +627,10 @@ void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev) if (proxy->class_code) { pci_config_set_class(config, proxy->class_code); } - pci_set_word(config + 0x2c, pci_get_word(config + PCI_VENDOR_ID)); - pci_set_word(config + 0x2e, vdev->device_id); - config[0x3d] = 1; + pci_set_word(config + PCI_SUBSYSTEM_VENDOR_ID, + pci_get_word(config + PCI_VENDOR_ID)); + pci_set_word(config + PCI_SUBSYSTEM_ID, vdev->device_id); + config[PCI_INTERRUPT_PIN] = 1; memory_region_init(&proxy->msix_bar, "virtio-msix", 4096); if (vdev->nvectors && !msix_init(&proxy->pci_dev, vdev->nvectors, |