|
 |
127bba |
From 8e8e5451fc4c34fd3bb30a193be8499d5148898f Mon Sep 17 00:00:00 2001
|
|
|
127bba |
Message-Id: <8e8e5451fc4c34fd3bb30a193be8499d5148898f@dist-git>
|
|
|
127bba |
From: Martin Kletzander <mkletzan@redhat.com>
|
|
|
127bba |
Date: Fri, 4 Nov 2016 10:29:40 +0100
|
|
|
127bba |
Subject: [PATCH] qemu: Reorder shmem params nicely
|
|
|
127bba |
|
|
|
127bba |
Always format id first so that we don't need to do that twice in
|
|
|
127bba |
different code paths.
|
|
|
127bba |
|
|
|
127bba |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
127bba |
(cherry picked from commit 6b5622e4b546eb0d0169b7f07ad3dae7a6560a35)
|
|
|
127bba |
|
|
|
127bba |
https://bugzilla.redhat.com/show_bug.cgi?id=1392031
|
|
|
127bba |
|
|
|
127bba |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
127bba |
---
|
|
|
127bba |
src/qemu/qemu_command.c | 6 ++++--
|
|
|
127bba |
tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 16 ++++++++--------
|
|
|
127bba |
2 files changed, 12 insertions(+), 10 deletions(-)
|
|
|
127bba |
|
|
|
127bba |
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
|
|
127bba |
index 6eafa5e..3ebfe84 100644
|
|
|
127bba |
--- a/src/qemu/qemu_command.c
|
|
|
127bba |
+++ b/src/qemu/qemu_command.c
|
|
|
127bba |
@@ -8471,13 +8471,15 @@ qemuBuildShmemDevLegacyStr(virDomainDefPtr def,
|
|
|
127bba |
}
|
|
|
127bba |
|
|
|
127bba |
virBufferAddLit(&buf, "ivshmem");
|
|
|
127bba |
+ virBufferAsprintf(&buf, ",id=%s", shmem->info.alias);
|
|
|
127bba |
+
|
|
|
127bba |
if (shmem->size)
|
|
|
127bba |
virBufferAsprintf(&buf, ",size=%llum", shmem->size >> 20);
|
|
|
127bba |
|
|
|
127bba |
if (!shmem->server.enabled) {
|
|
|
127bba |
- virBufferAsprintf(&buf, ",shm=%s,id=%s", shmem->name, shmem->info.alias);
|
|
|
127bba |
+ virBufferAsprintf(&buf, ",shm=%s", shmem->name);
|
|
|
127bba |
} else {
|
|
|
127bba |
- virBufferAsprintf(&buf, ",chardev=char%s,id=%s", shmem->info.alias, shmem->info.alias);
|
|
|
127bba |
+ virBufferAsprintf(&buf, ",chardev=char%s", shmem->info.alias);
|
|
|
127bba |
if (shmem->msi.enabled) {
|
|
|
127bba |
virBufferAddLit(&buf, ",msi=on");
|
|
|
127bba |
if (shmem->msi.vectors)
|
|
|
127bba |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem.args b/tests/qemuxml2argvdata/qemuxml2argv-shmem.args
|
|
|
127bba |
index 89caf49..99fac11 100644
|
|
|
127bba |
--- a/tests/qemuxml2argvdata/qemuxml2argv-shmem.args
|
|
|
127bba |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-shmem.args
|
|
|
127bba |
@@ -17,19 +17,19 @@ QEMU_AUDIO_DRV=none \
|
|
|
127bba |
-no-acpi \
|
|
|
127bba |
-boot c \
|
|
|
127bba |
-usb \
|
|
|
127bba |
--device ivshmem,shm=shmem0,id=shmem0,bus=pci.0,addr=0x3 \
|
|
|
127bba |
--device ivshmem,size=128m,shm=shmem1,id=shmem1,bus=pci.0,addr=0x5 \
|
|
|
127bba |
--device ivshmem,size=256m,shm=shmem2,id=shmem2,bus=pci.0,addr=0x4 \
|
|
|
127bba |
--device ivshmem,size=512m,chardev=charshmem3,id=shmem3,bus=pci.0,addr=0x6 \
|
|
|
127bba |
+-device ivshmem,id=shmem0,shm=shmem0,bus=pci.0,addr=0x3 \
|
|
|
127bba |
+-device ivshmem,id=shmem1,size=128m,shm=shmem1,bus=pci.0,addr=0x5 \
|
|
|
127bba |
+-device ivshmem,id=shmem2,size=256m,shm=shmem2,bus=pci.0,addr=0x4 \
|
|
|
127bba |
+-device ivshmem,id=shmem3,size=512m,chardev=charshmem3,bus=pci.0,addr=0x6 \
|
|
|
127bba |
-chardev socket,id=charshmem3,path=/var/lib/libvirt/shmem-shmem3-sock \
|
|
|
127bba |
--device ivshmem,size=1024m,chardev=charshmem4,id=shmem4,bus=pci.0,addr=0x7 \
|
|
|
127bba |
+-device ivshmem,id=shmem4,size=1024m,chardev=charshmem4,bus=pci.0,addr=0x7 \
|
|
|
127bba |
-chardev socket,id=charshmem4,path=/tmp/shmem4-sock \
|
|
|
127bba |
--device ivshmem,size=2048m,chardev=charshmem5,id=shmem5,msi=on,ioeventfd=off,\
|
|
|
127bba |
+-device ivshmem,id=shmem5,size=2048m,chardev=charshmem5,msi=on,ioeventfd=off,\
|
|
|
127bba |
bus=pci.0,addr=0x8 \
|
|
|
127bba |
-chardev socket,id=charshmem5,path=/tmp/shmem5-sock \
|
|
|
127bba |
--device ivshmem,size=4096m,chardev=charshmem6,id=shmem6,msi=on,vectors=16,\
|
|
|
127bba |
+-device ivshmem,id=shmem6,size=4096m,chardev=charshmem6,msi=on,vectors=16,\
|
|
|
127bba |
bus=pci.0,addr=0x9 \
|
|
|
127bba |
-chardev socket,id=charshmem6,path=/tmp/shmem6-sock \
|
|
|
127bba |
--device ivshmem,size=8192m,chardev=charshmem7,id=shmem7,msi=on,vectors=32,\
|
|
|
127bba |
+-device ivshmem,id=shmem7,size=8192m,chardev=charshmem7,msi=on,vectors=32,\
|
|
|
127bba |
ioeventfd=on,bus=pci.0,addr=0xa \
|
|
|
127bba |
-chardev socket,id=charshmem7,path=/tmp/shmem7-sock
|
|
|
127bba |
--
|
|
|
127bba |
2.10.2
|
|
|
127bba |
|