[libvirt] [PATCH v5 10/11] nvdimm: qemu command-line generating for unarmed property

[Luyao Zhong]

On 2018/12/20 下午5:14, Luyao Zhong wrote:
> According to the result parsing from xml, add unarmed property
> into QEMU command line:
> 
> -device nvdimm,...[,unarmed=on/off]
> 
> Signed-off-by: Luyao Zhong <luyao.zhong at intel.com>
> ---
>   src/qemu/qemu_command.c                            | 16 ++++++++--
>   src/qemu/qemu_command.h                            |  3 +-
>   src/qemu/qemu_hotplug.c                            |  2 +-
>   ...mory-hotplug-nvdimm-readonly.x86_64-latest.args | 36 ++++++++++++++++++++++
>   tests/qemuxml2argvtest.c                           |  1 +
>   5 files changed, 54 insertions(+), 4 deletions(-)
>   create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
> 
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index 6a06161..1de3d07 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -3567,7 +3567,8 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf,
>   
>   
>   char *
> -qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem)
> +qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem,
> +                         qemuDomainObjPrivatePtr priv)
>   {
>       virBuffer buf = VIR_BUFFER_INITIALIZER;
>       const char *device;
> @@ -3595,6 +3596,17 @@ qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem)
>           if (mem->labelsize)
>               virBufferAsprintf(&buf, "label-size=%llu,", mem->labelsize * 1024);
>   
> +        if (mem->readonly) {
> +            if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_NVDIMM_UNARMED)) {
> +                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> +                           _("Set readonly for nvdimm, but the corresponding unarmed"
> +                             "property is not available with this QEMU binary"));

I made a small mistake here, missing whitespace at line split will cause 
make syntax-check failed. To avoid too much emails disrupting everyone, 
I'll fix this with other comments from community in next version patch.

> +                return NULL;
> +            }
> +            virBufferAsprintf(&buf, "unarmed=%s,",
> +                              mem->readonly ? "on" : "off");
> +        }
> +
>           virBufferAsprintf(&buf, "memdev=mem%s,id=%s",
>                             mem->info.alias, mem->info.alias);
>   
> @@ -7894,7 +7906,7 @@ qemuBuildMemoryDeviceCommandLine(virCommandPtr cmd,
>           virCommandAddArg(cmd, "-object");
>           virCommandAddArgBuffer(cmd, &buf);
>   
> -        if (!(dimmStr = qemuBuildMemoryDeviceStr(def->mems[i])))
> +        if (!(dimmStr = qemuBuildMemoryDeviceStr(def->mems[i], priv)))
>               return -1;
>   
>           virCommandAddArgList(cmd, "-device", dimmStr, NULL);
> diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
> index 4647260..1a4f1f5 100644
> --- a/src/qemu/qemu_command.h
> +++ b/src/qemu/qemu_command.h
> @@ -128,7 +128,8 @@ int qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
>                                   virDomainMemoryDefPtr mem,
>                                   bool force);
>   
> -char *qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem);
> +char *qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem,
> +                               qemuDomainObjPrivatePtr priv);
>   
>   /* Current, best practice */
>   char *qemuBuildPCIHostdevDevStr(const virDomainDef *def,
> diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
> index 8da0233..a1c3ca9 100644
> --- a/src/qemu/qemu_hotplug.c
> +++ b/src/qemu/qemu_hotplug.c
> @@ -2563,7 +2563,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver,
>       if (virAsprintf(&objalias, "mem%s", mem->info.alias) < 0)
>           goto cleanup;
>   
> -    if (!(devstr = qemuBuildMemoryDeviceStr(mem)))
> +    if (!(devstr = qemuBuildMemoryDeviceStr(mem, priv)))
>           goto cleanup;
>   
>       if (qemuBuildMemoryBackendProps(&props, objalias, cfg,
> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
> new file mode 100644
> index 0000000..783d16b
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
> @@ -0,0 +1,36 @@
> +LC_ALL=C \
> +PATH=/bin \
> +HOME=/home/test \
> +USER=test \
> +LOGNAME=test \
> +QEMU_AUDIO_DRV=none \
> +/usr/bin/qemu-system-i686 \
> +-name guest=QEMUGuest1,debug-threads=on \
> +-S \
> +-object secret,id=masterKey0,format=raw,\
> +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
> +-machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
> +-m size=219136k,slots=16,maxmem=1099511627776k \
> +-realtime mlock=off \
> +-smp 2,sockets=2,cores=1,threads=1 \
> +-numa node,nodeid=0,cpus=0-1,mem=214 \
> +-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\
> +share=no,size=536870912 \
> +-device nvdimm,node=0,unarmed=on,memdev=memnvdimm0,id=nvdimm0,slot=0 \
> +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
> +-display none \
> +-no-user-config \
> +-nodefaults \
> +-chardev socket,id=charmonitor,fd=1729,server,nowait \
> +-mon chardev=charmonitor,id=monitor,mode=control \
> +-rtc base=utc \
> +-no-shutdown \
> +-no-acpi \
> +-boot strict=on \
> +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
> +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
> +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
> +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
> +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
> +resourcecontrol=deny \
> +-msg timestamp=on
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index a55b5ff..2cb8860 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -2760,6 +2760,7 @@ mymain(void)
>       DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-label");
>       DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-align");
>       DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-pmem");
> +    DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-readonly");
>   
>       DO_TEST("machine-aeskeywrap-on-caps",
>               QEMU_CAPS_AES_KEY_WRAP,
>