[libvirt] [PATCH v2 2/5] util: Do not assume comma after object id

For qemu object like rng-builtin, there are no properties after id property. We should always set comma after object id. Otherwise it will cause trailing comma on object: -object rng-builtin,id=ID, Signed-off-by: Han Han <hhan(a)redhat.com&gt; --- src/util/virqemu.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/util/virqemu.c b/src/util/virqemu.c index f3a233af3d..8d0429625d 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -239,12 +239,14 @@ virQEMUBuildObjectCommandlineFromJSONInternal(virBufferPtr buf, return -1; } - virBufferAsprintf(buf, "%s,id=%s,", type, alias); + virBufferAsprintf(buf, "%s,id=%s", type, alias); - if (props && - virQEMUBuildCommandLineJSON(props, buf, - virQEMUBuildCommandLineJSONArrayBitmap) < 0) - return -1; + if (props) { + virBufferAddLit(buf, ","); + if (virQEMUBuildCommandLineJSON(props, buf, + virQEMUBuildCommandLineJSONArrayBitmap) < 0) + return -1; + } return 0; } -- 2.24.0.rc1