From fda2c7a3be95b163c88132fe98ce19e2e624aa02 Mon Sep 17 00:00:00 2001 Message-Id: From: Martin Kletzander Date: Thu, 10 Nov 2016 10:16:59 +0100 Subject: [PATCH] qemu: Make sure shmem memory is shared Even though using /dev/shm/asdf as the backend, we still need to make the mapping shared. The original patch forgot to add that parameter. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1392031 Signed-off-by: Martin Kletzander (cherry picked from commit 5672a265ce061827595be2270f29e8eb920313bd) Signed-off-by: Martin Kletzander --- src/qemu/qemu_command.c | 1 + tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index dd8f60f..43e1a93 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8580,6 +8580,7 @@ qemuBuildShmemBackendMemProps(virDomainShmemDefPtr shmem) virJSONValueObjectCreate(&ret, "s:mem-path", mem_path, "U:size", shmem->size, + "b:share", true, NULL); VIR_FREE(mem_path); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args b/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args index 7abc7f8..688b7c7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args @@ -18,13 +18,13 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -object memory-backend-file,id=shmmem-shmem0,mem-path=/dev/shm/shmem0,\ -size=4194304 \ +size=4194304,share=yes \ -device ivshmem-plain,id=shmem0,memdev=shmmem-shmem0,bus=pci.0,addr=0x3 \ -object memory-backend-file,id=shmmem-shmem1,mem-path=/dev/shm/shmem1,\ -size=134217728 \ +size=134217728,share=yes \ -device ivshmem-plain,id=shmem1,memdev=shmmem-shmem1,bus=pci.0,addr=0x5 \ -object memory-backend-file,id=shmmem-shmem2,mem-path=/dev/shm/shmem2,\ -size=268435456 \ +size=268435456,share=yes \ -device ivshmem-plain,id=shmem2,memdev=shmmem-shmem2,bus=pci.0,addr=0x4 \ -device ivshmem-doorbell,id=shmem3,chardev=charshmem3,ioeventfd=on,bus=pci.0,\ addr=0x6 \ -- 2.10.2