[libvirt] [PATCH 02/10] qemu: always build id when generate shared memory device CLI

Martin Kletzander mkletzan at redhat.com
Fri Jul 3 12:41:26 UTC 2015


On Wed, Jun 17, 2015 at 11:56:13AM +0800, Luyao Huang wrote:
>When hot-unplug the device, qmp command device_del require a
>device id.
>
>Signed-off-by: Luyao Huang <lhuang at redhat.com>
>---
> src/qemu/qemu_command.c                        |  4 ++--
> tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 16 ++++++++--------
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
>index 5ac43d8..636e040 100644
>--- a/src/qemu/qemu_command.c
>+++ b/src/qemu/qemu_command.c
>@@ -8470,9 +8470,9 @@ qemuBuildShmemDevCmd(virCommandPtr cmd,
>     }
>
>     if (!shmem->server.enabled) {
>-        virBufferAsprintf(&buf, ",shm=%s", shmem->name);
>+        virBufferAsprintf(&buf, ",shm=%s,id=%s", shmem->name, shmem->info.alias);
>     } else {
>-        virBufferAsprintf(&buf, ",chardev=char%s", shmem->info.alias);
>+        virBufferAsprintf(&buf, ",chardev=char%s,id=%s", shmem->info.alias, shmem->info.alias);
>         if (shmem->msi.enabled) {
>             virBufferAddLit(&buf, ",msi=on");
>             if (shmem->msi.vectors)
>diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem.args b/tests/qemuxml2argvdata/qemuxml2argv-shmem.args
>index d37879a..601167c 100644
>--- a/tests/qemuxml2argvdata/qemuxml2argv-shmem.args
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-shmem.args
>@@ -1,16 +1,16 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefaults \
> -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
>--device ivshmem,shm=shmem0,bus=pci.0,addr=0x3 \
>--device ivshmem,size=128m,shm=shmem1,bus=pci.0,addr=0x4 \
>--device ivshmem,size=256m,shm=shmem2,bus=pci.0,addr=0x5 \
>--device ivshmem,size=512m,chardev=charshmem3,bus=pci.0,addr=0x6 \
>+-device ivshmem,shm=shmem0,id=shmem0,bus=pci.0,addr=0x3 \
>+-device ivshmem,size=128m,shm=shmem1,id=shmem1,bus=pci.0,addr=0x4 \
>+-device ivshmem,size=256m,shm=shmem2,id=shmem2,bus=pci.0,addr=0x5 \
>+-device ivshmem,size=512m,chardev=charshmem3,id=shmem3,bus=pci.0,addr=0x6 \
> -chardev socket,id=charshmem3,path=/var/lib/libvirt/shmem-shmem3-sock \
>--device ivshmem,size=1024m,chardev=charshmem4,bus=pci.0,addr=0x7 \
>+-device ivshmem,size=1024m,chardev=charshmem4,id=shmem4,bus=pci.0,addr=0x7 \
> -chardev socket,id=charshmem4,path=/tmp/shmem4-sock \
>--device ivshmem,size=2048m,chardev=charshmem5,msi=on,ioeventfd=off,bus=pci.0,addr=0x8 \
>+-device ivshmem,size=2048m,chardev=charshmem5,id=shmem5,msi=on,ioeventfd=off,bus=pci.0,addr=0x8 \
> -chardev socket,id=charshmem5,path=/tmp/shmem5-sock \
>--device ivshmem,size=4096m,chardev=charshmem6,msi=on,vectors=16,bus=pci.0,addr=0x9 \
>+-device ivshmem,size=4096m,chardev=charshmem6,id=shmem6,msi=on,vectors=16,bus=pci.0,addr=0x9 \
> -chardev socket,id=charshmem6,path=/tmp/shmem6-sock \
>--device ivshmem,size=8192m,chardev=charshmem7,msi=on,vectors=32,ioeventfd=on,bus=pci.0,addr=0xa \
>+-device ivshmem,size=8192m,chardev=charshmem7,id=shmem7,msi=on,vectors=32,ioeventfd=on,bus=pci.0,addr=0xa \

make syntax-check complains about these, so they need to be split.  No
problem, though, ACK with that changed.

> -chardev socket,id=charshmem7,path=/tmp/shmem7-sock
>--
>1.8.3.1
>
>--
>libvir-list mailing list
>libvir-list at redhat.com
>https://www.redhat.com/mailman/listinfo/libvir-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20150703/0465817f/attachment-0001.sig>


More information about the libvir-list mailing list