External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 14:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Reorder shmem params nicely

Browse Source 
Always format id first so that we don't need to do that twice in
different code paths.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2016-08-10 09:34:45 +02:00
parent 9187cecc81
commit 6b5622e4b5
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_command.c
View File

@ -8518,13 +8518,15 @@ qemuBuildShmemDevLegacyStr(virDomainDefPtr def,
}
virBufferAddLit(&buf, "ivshmem");
virBufferAsprintf(&buf, ",id=%s", shmem->info.alias);
if (shmem->size)
virBufferAsprintf(&buf, ",size=%llum", shmem->size >> 20);
if (!shmem->server.enabled) {
virBufferAsprintf(&buf, ",shm=%s,id=%s", shmem->name, shmem->info.alias);
virBufferAsprintf(&buf, ",shm=%s", shmem->name);
} else {
virBufferAsprintf(&buf, ",chardev=char%s,id=%s", shmem->info.alias, shmem->info.alias);
virBufferAsprintf(&buf, ",chardev=char%s", shmem->info.alias);
if (shmem->msi.enabled) {
virBufferAddLit(&buf, ",msi=on");
if (shmem->msi.vectors)

16
tests/qemuxml2argvdata/qemuxml2argv-shmem.args
View File

@ -17,19 +17,19 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot c \
-usb \
-device ivshmem,shm=shmem0,id=shmem0,bus=pci.0,addr=0x3 \
-device ivshmem,size=128m,shm=shmem1,id=shmem1,bus=pci.0,addr=0x5 \
-device ivshmem,size=256m,shm=shmem2,id=shmem2,bus=pci.0,addr=0x4 \
-device ivshmem,size=512m,chardev=charshmem3,id=shmem3,bus=pci.0,addr=0x6 \
-device ivshmem,id=shmem0,shm=shmem0,bus=pci.0,addr=0x3 \
-device ivshmem,id=shmem1,size=128m,shm=shmem1,bus=pci.0,addr=0x5 \
-device ivshmem,id=shmem2,size=256m,shm=shmem2,bus=pci.0,addr=0x4 \
-device ivshmem,id=shmem3,size=512m,chardev=charshmem3,bus=pci.0,addr=0x6 \
-chardev socket,id=charshmem3,path=/var/lib/libvirt/shmem-shmem3-sock \
-device ivshmem,size=1024m,chardev=charshmem4,id=shmem4,bus=pci.0,addr=0x7 \
-device ivshmem,id=shmem4,size=1024m,chardev=charshmem4,bus=pci.0,addr=0x7 \
-chardev socket,id=charshmem4,path=/tmp/shmem4-sock \
-device ivshmem,size=2048m,chardev=charshmem5,id=shmem5,msi=on,ioeventfd=off,\
-device ivshmem,id=shmem5,size=2048m,chardev=charshmem5,msi=on,ioeventfd=off,\
bus=pci.0,addr=0x8 \
-chardev socket,id=charshmem5,path=/tmp/shmem5-sock \
-device ivshmem,size=4096m,chardev=charshmem6,id=shmem6,msi=on,vectors=16,\
-device ivshmem,id=shmem6,size=4096m,chardev=charshmem6,msi=on,vectors=16,\
bus=pci.0,addr=0x9 \
-chardev socket,id=charshmem6,path=/tmp/shmem6-sock \
-device ivshmem,size=8192m,chardev=charshmem7,id=shmem7,msi=on,vectors=32,\
-device ivshmem,id=shmem7,size=8192m,chardev=charshmem7,msi=on,vectors=32,\
ioeventfd=on,bus=pci.0,addr=0xa \
-chardev socket,id=charshmem7,path=/tmp/shmem7-sock