NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

util: qemu: Don't access virJSONValue directly in virQEMUBuildCommandLineJSONRecurse

Browse Source 
Use the accessors instead.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Peter Krempa 2018-03-29 20:41:07 +02:00
parent 1cbe6aa220
commit 66cb1fa231
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/virqemu.c
View File

@ -148,6 +148,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
struct virQEMUCommandLineJSONIteratorData data = { key, buf, arrayFunc }; struct virQEMUCommandLineJSONIteratorData data = { key, buf, arrayFunc };
virJSONType type = virJSONValueGetType(value); virJSONType type = virJSONValueGetType(value);
virJSONValuePtr elem; virJSONValuePtr elem;
bool tmp;
size_t i; size_t i;
if (!key && type != VIR_JSON_TYPE_OBJECT) { if (!key && type != VIR_JSON_TYPE_OBJECT) {
@ -159,16 +160,17 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
switch (type) { switch (type) {
case VIR_JSON_TYPE_STRING: case VIR_JSON_TYPE_STRING:
virBufferAsprintf(buf, "%s=", key); virBufferAsprintf(buf, "%s=", key);
virQEMUBuildBufferEscapeComma(buf, value->data.string); virQEMUBuildBufferEscapeComma(buf, virJSONValueGetString(value));
virBufferAddLit(buf, ","); virBufferAddLit(buf, ",");
break; break;
case VIR_JSON_TYPE_NUMBER: case VIR_JSON_TYPE_NUMBER:
virBufferAsprintf(buf, "%s=%s,", key, value->data.number); virBufferAsprintf(buf, "%s=%s,", key, virJSONValueGetNumberString(value));
break; break;
case VIR_JSON_TYPE_BOOLEAN: case VIR_JSON_TYPE_BOOLEAN:
if (value->data.boolean) virJSONValueGetBoolean(value, &tmp);
if (tmp)
virBufferAsprintf(buf, "%s=yes,", key); virBufferAsprintf(buf, "%s=yes,", key);
else else
virBufferAsprintf(buf, "%s=no,", key); virBufferAsprintf(buf, "%s=no,", key);