diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-25 11:38:03 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-25 11:38:03 +0000 |
| commit | 1aae36df4b8ed884c6ef6995e70c67fad79b49df (patch) | |
| tree | 059f6801255605ff19fbc616c19a2e2a6abb1b5f /tests | |
| parent | 4b6eda626fdb8bf90472c6868d502a2ac09abeeb (diff) | |
| parent | 1d649244b3695cb148dd2ae66999db0f6f9566b3 (diff) | |
| download | hqemu-1aae36df4b8ed884c6ef6995e70c67fad79b49df.zip hqemu-1aae36df4b8ed884c6ef6995e70c67fad79b49df.tar.gz | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-ivshmem-2015-11-25' into staging
ivshmem patches for 2.5
# gpg: Signature made Wed 25 Nov 2015 09:25:38 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
* remotes/armbru/tags/pull-ivshmem-2015-11-25:
ivshmem: Rename property memdev to x-memdev for 2.5
ivshmem: Mark questionable socket type test FIXME
tests/ivshmem-test: Supply missing initializer in get_device()
qemu-doc: Fix ivshmem usage example with shm=...
qemu-doc: Fix ivshmem example markup
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ivshmem-test.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c index f1793ba..03c7b96 100644 --- a/tests/ivshmem-test.c +++ b/tests/ivshmem-test.c @@ -40,6 +40,7 @@ static QPCIDevice *get_device(void) QPCIBus *pcibus; pcibus = qpci_init_pc(); + dev = NULL; qpci_device_foreach(pcibus, 0x1af4, 0x1110, save_fn, &dev); g_assert(dev != NULL); @@ -392,7 +393,7 @@ static void test_ivshmem_memdev(void) /* just for the sake of checking memory-backend property */ setup_vm_cmd(&state, "-object memory-backend-ram,size=1M,id=mb1" - " -device ivshmem,memdev=mb1", false); + " -device ivshmem,x-memdev=mb1", false); qtest_quit(state.qtest); } |
