[libvirt] [PATCH 7/7] qemu: Support newer ivshmem and prefer that over the legacy one
Martin Kletzander
mkletzan at redhat.com
Wed Aug 10 11:50:11 UTC 2016
QEMU added support for ivshmem-plain and ivshmem-doorbell. Those are
reworked varians of legacy ivshmem that are compatible, but have sane
specification and handling.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1347049
Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
src/qemu/qemu_command.c | 66 ++++++++++++++++++++--
.../qemuxml2argv-shmem-plain-doorbell.args | 42 ++++++++++++++
.../qemuxml2argv-shmem-plain-doorbell.xml | 54 ++++++++++++++++++
tests/qemuxml2argvtest.c | 3 +
4 files changed, 161 insertions(+), 4 deletions(-)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.xml
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 2d670edcd848..40a8d861503e 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8445,6 +8445,50 @@ qemuBuildShmemDevLegacyStr(virDomainDefPtr def,
return NULL;
}
+static int
+qemuBuildShmemDevCommandLine(virCommandPtr cmd,
+ virDomainDefPtr def,
+ virDomainShmemDefPtr shmem,
+ virQEMUCapsPtr qemuCaps)
+{
+ virBuffer buf = VIR_BUFFER_INITIALIZER;
+
+ virCommandAddArg(cmd, "-device");
+
+ if (shmem->server.enabled) {
+ virBufferAddLit(&buf, "ivshmem-doorbell");
+ virBufferAsprintf(&buf, ",id=%s,chardev=char%s",
+ shmem->info.alias, shmem->info.alias);
+ if (shmem->msi.vectors)
+ virBufferAsprintf(&buf, ",vectors=%u", shmem->msi.vectors);
+ if (shmem->msi.ioeventfd)
+ virBufferAsprintf(&buf, ",ioeventfd=%s",
+ virTristateSwitchTypeToString(shmem->msi.ioeventfd));
+ } else {
+ virBufferAddLit(&buf, "ivshmem-plain");
+ virBufferAsprintf(&buf, ",id=%s,memdev=shmmem-%s",
+ shmem->info.alias, shmem->info.alias);
+ }
+
+ if (qemuBuildDeviceAddressStr(&buf, def, &shmem->info, qemuCaps) < 0) {
+ virBufferFreeAndReset(&buf);
+ return -1;
+ }
+
+ virCommandAddArgBuffer(cmd, &buf);
+
+ if (!shmem->server.enabled) {
+ virBufferAddLit(&buf, "memory-backend-file");
+ virBufferAsprintf(&buf, ",id=shmmem-%s,size=%llum,mem-path=/dev/shm/%s",
+ shmem->info.alias, shmem->size >> 20, shmem->name);
+
+ virCommandAddArg(cmd, "-device");
+ virCommandAddArgBuffer(cmd, &buf);
+ }
+
+ return 0;
+}
+
static char *
qemuBuildShmemBackendStr(virLogManagerPtr logManager,
virCommandPtr cmd,
@@ -8511,10 +8555,24 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager,
}
}
- if (!(devstr = qemuBuildShmemDevLegacyStr(def, shmem, qemuCaps)))
- return -1;
- virCommandAddArgList(cmd, "-device", devstr, NULL);
- VIR_FREE(devstr);
+ if (virQEMUCapsGet(qemuCaps, shmem->server.enabled ?
+ QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL :
+ QEMU_CAPS_DEVICE_IVSHMEM_PLAIN)) {
+ if (qemuBuildShmemDevCommandLine(cmd, def, shmem, qemuCaps) < 0)
+ return -1;
+ } else {
+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("ivshmem device is not supported "
+ "with this QEMU binary"));
+ return -1;
+ }
+
+ if (!(devstr = qemuBuildShmemDevLegacyStr(def, shmem, qemuCaps)))
+ return -1;
+ virCommandAddArgList(cmd, "-device", devstr, NULL);
+ VIR_FREE(devstr);
+ }
if (shmem->server.enabled) {
if (!(devstr = qemuBuildShmemBackendStr(logManager, cmd, cfg, def,
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args b/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args
new file mode 100644
index 000000000000..3f246f7a018e
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args
@@ -0,0 +1,42 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu \
+-name QEMUGuest1 \
+-S \
+-M pc \
+-m 214 \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-nographic \
+-nodefaults \
+-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
+-no-acpi \
+-boot c \
+-usb \
+-device ivshmem-plain,id=shmem0,memdev=shmmem-shmem0,bus=pci.0,addr=0x3 \
+-device memory-backend-file,id=shmmem-shmem0,size=4m,mem-path=/dev/shm/shmem0 \
+-device ivshmem-plain,id=shmem1,memdev=shmmem-shmem1,bus=pci.0,addr=0x5 \
+-device memory-backend-file,id=shmmem-shmem1,size=128m,\
+mem-path=/dev/shm/shmem1 \
+-device ivshmem-plain,id=shmem2,memdev=shmmem-shmem2,bus=pci.0,addr=0x4 \
+-device memory-backend-file,id=shmmem-shmem2,size=256m,\
+mem-path=/dev/shm/shmem2 \
+-device ivshmem-doorbell,id=shmem3,chardev=charshmem3,ioeventfd=on,bus=pci.0,\
+addr=0x6 \
+-chardev socket,id=charshmem3,path=/var/lib/libvirt/shmem-shmem3-sock \
+-device ivshmem-doorbell,id=shmem4,chardev=charshmem4,ioeventfd=on,bus=pci.0,\
+addr=0x7 \
+-chardev socket,id=charshmem4,path=/tmp/shmem4-sock \
+-device ivshmem-doorbell,id=shmem5,chardev=charshmem5,ioeventfd=off,bus=pci.0,\
+addr=0x8 \
+-chardev socket,id=charshmem5,path=/tmp/shmem5-sock \
+-device ivshmem-doorbell,id=shmem6,chardev=charshmem6,vectors=16,ioeventfd=on,\
+bus=pci.0,addr=0x9 \
+-chardev socket,id=charshmem6,path=/tmp/shmem6-sock \
+-device ivshmem-doorbell,id=shmem7,chardev=charshmem7,vectors=32,ioeventfd=on,\
+bus=pci.0,addr=0xa \
+-chardev socket,id=charshmem7,path=/tmp/shmem7-sock
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.xml b/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.xml
new file mode 100644
index 000000000000..5bc49044894c
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.xml
@@ -0,0 +1,54 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='i686' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu</emulator>
+ <controller type='usb' index='0'/>
+ <controller type='pci' index='0' model='pci-root'/>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <memballoon model='none'/>
+ <shmem name='shmem0'/>
+ <shmem name='shmem1'>
+ <size unit='M'>128</size>
+ </shmem>
+ <shmem name='shmem2'>
+ <size unit='M'>256</size>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+ </shmem>
+ <shmem name='shmem3'>
+ <size unit='M'>512</size>
+ <server/>
+ </shmem>
+ <shmem name='shmem4'>
+ <size unit='M'>1024</size>
+ <server path='/tmp/shmem4-sock'/>
+ </shmem>
+ <shmem name='shmem5'>
+ <size unit='M'>2048</size>
+ <server path='/tmp/shmem5-sock'/>
+ <msi ioeventfd='off'/>
+ </shmem>
+ <shmem name='shmem6'>
+ <size unit='M'>4096</size>
+ <server path='/tmp/shmem6-sock'/>
+ <msi vectors='16'/>
+ </shmem>
+ <shmem name='shmem7'>
+ <size unit='M'>8192</size>
+ <server path='/tmp/shmem7-sock'/>
+ <msi vectors='32' ioeventfd='on'/>
+ </shmem>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index d5948360072f..8f382dd90091 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1948,6 +1948,9 @@ mymain(void)
DO_TEST("fips-enabled", QEMU_CAPS_ENABLE_FIPS);
DO_TEST("shmem", QEMU_CAPS_DEVICE_IVSHMEM);
+ DO_TEST("shmem-plain-doorbell", QEMU_CAPS_DEVICE_IVSHMEM,
+ QEMU_CAPS_DEVICE_IVSHMEM_PLAIN,
+ QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL);
DO_TEST_FAILURE("shmem", NONE);
DO_TEST_FAILURE("shmem-invalid-size",
QEMU_CAPS_DEVICE_IVSHMEM);
--
2.9.2
More information about the libvir-list
mailing list