openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Han Han 2020-01-09 16:00:06 +08:00 committed by Michal Privoznik
parent 9378713f56
commit 1bd17918b6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/virqemu.c
View File

@ -239,12 +239,14 @@ virQEMUBuildObjectCommandlineFromJSONInternal(virBufferPtr buf,
return -1; return -1;
} }
virBufferAsprintf(buf, "%s,id=%s,", type, alias); virBufferAsprintf(buf, "%s,id=%s", type, alias);
if (props && if (props) {
virQEMUBuildCommandLineJSON(props, buf, virBufferAddLit(buf, ",");
virQEMUBuildCommandLineJSONArrayBitmap) < 0) if (virQEMUBuildCommandLineJSON(props, buf,
return -1; virQEMUBuildCommandLineJSONArrayBitmap) < 0)
return -1;
}
return 0; return 0;
} }