diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-11-24 18:06:29 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-11-25 10:24:27 +0100 |
| commit | 1d649244b3695cb148dd2ae66999db0f6f9566b3 (patch) | |
| tree | 059f6801255605ff19fbc616c19a2e2a6abb1b5f | |
| parent | 2825717c02f5b1367e8e315b222888db00618170 (diff) | |
| download | hqemu-1d649244b3695cb148dd2ae66999db0f6f9566b3.zip hqemu-1d649244b3695cb148dd2ae66999db0f6f9566b3.tar.gz | |
ivshmem: Rename property memdev to x-memdev for 2.5
The device's guest interface and its QEMU user interface are
flawed^Whotly debated. We'll resolve that in the next development
cycle, probably by deprecating the device in favour of a cleaned up,
but not quite compatible revision.
To avoid adding more baggage to the soon-to-be-deprecated interface,
mark property "memdev" as experimental, by renaming it to "x-memdev".
It's the only recent user interface change.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1448384789-14830-6-git-send-email-armbru@redhat.com>
[Update of qemu-doc.texi squashed in]
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
| -rw-r--r-- | hw/misc/ivshmem.c | 8 | ||||
| -rw-r--r-- | qemu-doc.texi | 2 | ||||
| -rw-r--r-- | tests/ivshmem-test.c | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index edb2270..f73f0c2 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -60,8 +60,6 @@ #define IVSHMEM(obj) \ OBJECT_CHECK(IVShmemState, (obj), TYPE_IVSHMEM) -#define IVSHMEM_MEMDEV_PROP "memdev" - typedef struct Peer { int nb_eventfds; EventNotifier *eventfds; @@ -857,8 +855,8 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error **errp) PCI_BASE_ADDRESS_MEM_PREFETCH; if (!!s->server_chr + !!s->shmobj + !!s->hostmem != 1) { - error_setg(errp, "You must specify either a shmobj, a chardev" - " or a hostmem"); + error_setg(errp, + "You must specify either 'shm', 'chardev' or 'x-memdev'"); return; } @@ -1182,7 +1180,7 @@ static void ivshmem_init(Object *obj) { IVShmemState *s = IVSHMEM(obj); - object_property_add_link(obj, IVSHMEM_MEMDEV_PROP, TYPE_MEMORY_BACKEND, + object_property_add_link(obj, "x-memdev", TYPE_MEMORY_BACKEND, (Object **)&s->hostmem, ivshmem_check_memdev_is_busy, OBJ_PROP_LINK_UNREF_ON_RELEASE, diff --git a/qemu-doc.texi b/qemu-doc.texi index 68ca075..ffc3e50 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -1300,7 +1300,7 @@ a memory backend that has hugepage support: @example qemu-system-i386 -object memory-backend-file,size=1G,mem-path=/mnt/hugepages/my-shmem-file,id=mb1 - -device ivshmem,memdev=mb1 + -device ivshmem,x-memdev=mb1 @end example ivshmem-server also supports hugepages mount points with the diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c index 8f1a849..03c7b96 100644 --- a/tests/ivshmem-test.c +++ b/tests/ivshmem-test.c @@ -393,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); } |
