path: root/hw/pci/pci.c
diff options
authorPeter Maydell <peter.maydell@linaro.org>2015-07-20 13:25:28 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-07-20 13:25:28 +0100
commitf73ca7363440240b7ee5ee7f7ddb1c64751efb54 (patch)
tree3a5a63dc82049cff15f105d68617be7d3b2571c1 /hw/pci/pci.c
parent71358470eec668f5dc53def25e585ce250cea9bf (diff)
parentf9d6dbf0bf6e91b8ed896369ab1b7e91e5a1a4df (diff)
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio, vhost, pc fixes for 2.4 The only notable thing here is vhost-user multiqueue revert. We'll work on making it stable in 2.5, reverting now means we won't have to maintain bug for bug compability forever. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Mon Jul 20 12:24:00 2015 BST using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" * remotes/mst/tags/for_upstream: virtio-net: remove virtio queues if the guest doesn't support multiqueue virtio-net: Flush incoming queues when DRIVER_OK is being set pci_add_capability: remove duplicate comments virtio-net: unbreak any layout Revert "vhost-user: add multi queue support" ich9: fix skipped vmstate_memhp_state subsection Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/pci/pci.c')
1 files changed, 2 insertions, 4 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 442f822f42..a017614d48 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -2101,12 +2101,10 @@ static void pci_del_option_rom(PCIDevice *pdev)
- * if !offset
- * Reserve space and add capability to the linked list in pci config space
- *
* if offset = 0,
* Find and reserve space and add capability to the linked list
- * in pci config space */
+ * in pci config space
+ */
int pci_add_capability(PCIDevice *pdev, uint8_t cap_id,
uint8_t offset, uint8_t size)