aboutsummaryrefslogtreecommitdiff
path: root/hw/pci-host
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-02-19 10:50:37 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-02-19 10:50:37 +0000
commit09125c5e76923aa22a72f43cb34b6e74ae7fe17f (patch)
treef396e1b2e8c350741b88632c1700658c422bda15 /hw/pci-host
parentdd5e38b19d7cb07d317e1285941d8245c01da540 (diff)
parenta28c393cc261afeb4863b05d7c33c2a5fc55ef38 (diff)
downloadqemu-09125c5e76923aa22a72f43cb34b6e74ae7fe17f.zip
qemu-09125c5e76923aa22a72f43cb34b6e74ae7fe17f.tar.gz
qemu-09125c5e76923aa22a72f43cb34b6e74ae7fe17f.tar.bz2
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
vhost, virtio, pci, pxe Fixes all over the place. New tests for pxe. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Thu 18 Feb 2016 15:46:39 GMT 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: tests/vhost-user-bridge: add scattering of incoming packets vhost-user interrupt management fixes rules: filter out irrelevant files change type of pci_bridge_initfn() to void dec: convert to realize() tests: add pxe e1000 and virtio-pci tests msix: fix msix_vector_masked virtio: optimize virtio_access_is_big_endian() for little-endian targets vhost: simplify vhost_needs_vring_endian() vhost: move virtio 1.0 check to cross-endian helper virtio: move cross-endian helper to vhost vhost-net: revert support of cross-endian vnet headers virtio-net: use the backend cross-endian capabilities Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/pci-host')
-rw-r--r--hw/pci-host/apb.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c
index 75dee50..aaef7bb 100644
--- a/hw/pci-host/apb.c
+++ b/hw/pci-host/apb.c
@@ -635,12 +635,7 @@ static void pci_apb_set_irq(void *opaque, int irq_num, int level)
static int apb_pci_bridge_initfn(PCIDevice *dev)
{
- int rc;
-
- rc = pci_bridge_initfn(dev, TYPE_PCI_BUS);
- if (rc < 0) {
- return rc;
- }
+ pci_bridge_initfn(dev, TYPE_PCI_BUS);
/*
* command register: