diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-02 13:31:19 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-02 13:31:19 +0000 |
| commit | 074d1ccb42296f7a83ec10f3344c15be7c21fb75 (patch) | |
| tree | e571318b036f859ae5e01324987d7acf180a082d /tests/libqos/pci.c | |
| parent | 10ae9d76388e3f4a31f6a1475b5e2d1f28404a10 (diff) | |
| parent | 6db262557260129883c5aa47d47556f4075a3e5c (diff) | |
| download | focaccia-qemu-074d1ccb42296f7a83ec10f3344c15be7c21fb75.tar.gz focaccia-qemu-074d1ccb42296f7a83ec10f3344c15be7c21fb75.zip | |
Merge remote-tracking branch 'remotes/elmarco/tags/ivshmem-pull-request' into staging
# gpg: Signature made Tue 02 Feb 2016 12:43:03 GMT using RSA key ID 75969CE5 # gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" # gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5 * remotes/elmarco/tags/ivshmem-pull-request: char: remove qemu_chr_open_eventfd ivshmem: use a single eventfd callback, get rid of CharDriver ivshmem: generalize ivshmem_setup_interrupts ivshmem-test: test both msi & irq cases libqos: remove some leaks ivshmem-test: leak fixes ivshmem: remove redundant assignment, fix crash with msi=off ivshmem: no need for opaque argument Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/libqos/pci.c')
| -rw-r--r-- | tests/libqos/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/libqos/pci.c b/tests/libqos/pci.c index 4e630c250a..80b1a2117d 100644 --- a/tests/libqos/pci.c +++ b/tests/libqos/pci.c @@ -34,11 +34,13 @@ void qpci_device_foreach(QPCIBus *bus, int vendor_id, int device_id, if (vendor_id != -1 && qpci_config_readw(dev, PCI_VENDOR_ID) != vendor_id) { + g_free(dev); continue; } if (device_id != -1 && qpci_config_readw(dev, PCI_DEVICE_ID) != device_id) { + g_free(dev); continue; } |