shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 21:34:54 +03:00
Code Releases Activity

qemu: Drop virQEMUCapsFreeStringList

Browse Source 
The implementation matches virStringListFreeCount. The only difference
between the two functions is the ordering of their parameters.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2017-03-03 21:31:26 +01:00
parent cbcfd09769
commit f012386cbd
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/qemu/qemu_capabilities.c
View File

@ -1881,19 +1881,6 @@ virQEMUCapsProcessProps(virQEMUCapsPtr qemuCaps,
} }
static void
virQEMUCapsFreeStringList(size_t len,
char **values)
{
size_t i;
if (!values)
return;
for (i = 0; i < len; i++)
VIR_FREE(values[i]);
VIR_FREE(values);
}
#define OBJECT_TYPE_PREFIX "name \"" #define OBJECT_TYPE_PREFIX "name \""
static int static int
@ -1928,7 +1915,7 @@ virQEMUCapsParseDeviceStrObjectTypes(const char *str,
cleanup: cleanup:
if (ret < 0) if (ret < 0)
virQEMUCapsFreeStringList(ntypelist, typelist); virStringListFreeCount(typelist, ntypelist);
return ret; return ret;
} }
@ -1981,7 +1968,7 @@ virQEMUCapsParseDeviceStrObjectProps(const char *str,
cleanup: cleanup:
if (ret < 0) if (ret < 0)
virQEMUCapsFreeStringList(nproplist, proplist); virStringListFreeCount(proplist, nproplist);
return ret; return ret;
} }
@ -1999,7 +1986,7 @@ virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, const char *str)
ARRAY_CARDINALITY(virQEMUCapsObjectTypes), ARRAY_CARDINALITY(virQEMUCapsObjectTypes),
virQEMUCapsObjectTypes, virQEMUCapsObjectTypes,
nvalues, values); nvalues, values);
virQEMUCapsFreeStringList(nvalues, values); virStringListFreeCount(values, nvalues);
for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) { for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) {
const char *type = virQEMUCapsObjectProps[i].type; const char *type = virQEMUCapsObjectProps[i].type;
@ -2011,7 +1998,7 @@ virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, const char *str)
virQEMUCapsObjectProps[i].nprops, virQEMUCapsObjectProps[i].nprops,
virQEMUCapsObjectProps[i].props, virQEMUCapsObjectProps[i].props,
nvalues, values); nvalues, values);
virQEMUCapsFreeStringList(nvalues, values); virStringListFreeCount(values, nvalues);
} }
/* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */ /* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */
@ -2665,7 +2652,7 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps,
ARRAY_CARDINALITY(virQEMUCapsCommands), ARRAY_CARDINALITY(virQEMUCapsCommands),
virQEMUCapsCommands, virQEMUCapsCommands,
ncommands, commands); ncommands, commands);
virQEMUCapsFreeStringList(ncommands, commands); virStringListFreeCount(commands, ncommands);
/* QMP add-fd was introduced in 1.2, but did not support /* QMP add-fd was introduced in 1.2, but did not support
* management control of set numbering, and did not have a * management control of set numbering, and did not have a
@ -2707,7 +2694,7 @@ virQEMUCapsProbeQMPEvents(virQEMUCapsPtr qemuCaps,
ARRAY_CARDINALITY(virQEMUCapsEvents), ARRAY_CARDINALITY(virQEMUCapsEvents),
virQEMUCapsEvents, virQEMUCapsEvents,
nevents, events); nevents, events);
virQEMUCapsFreeStringList(nevents, events); virStringListFreeCount(events, nevents);
return 0; return 0;
} }
@ -2727,7 +2714,7 @@ virQEMUCapsProbeQMPObjects(virQEMUCapsPtr qemuCaps,
ARRAY_CARDINALITY(virQEMUCapsObjectTypes), ARRAY_CARDINALITY(virQEMUCapsObjectTypes),
virQEMUCapsObjectTypes, virQEMUCapsObjectTypes,
nvalues, values); nvalues, values);
virQEMUCapsFreeStringList(nvalues, values); virStringListFreeCount(values, nvalues);
for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) { for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) {
const char *type = virQEMUCapsObjectProps[i].type; const char *type = virQEMUCapsObjectProps[i].type;
@ -2743,7 +2730,7 @@ virQEMUCapsProbeQMPObjects(virQEMUCapsPtr qemuCaps,
ARRAY_CARDINALITY(virQEMUCapsPropObjects), ARRAY_CARDINALITY(virQEMUCapsPropObjects),
virQEMUCapsPropObjects, type, virQEMUCapsPropObjects, type,
nvalues, values); nvalues, values);
virQEMUCapsFreeStringList(nvalues, values); virStringListFreeCount(values, nvalues);
} }
/* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */ /* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */
@ -3043,7 +3030,7 @@ virQEMUCapsProbeQMPMigrationCapabilities(virQEMUCapsPtr qemuCaps,
ARRAY_CARDINALITY(virQEMUCapsMigration), ARRAY_CARDINALITY(virQEMUCapsMigration),
virQEMUCapsMigration, virQEMUCapsMigration,
ncaps, caps); ncaps, caps);
virQEMUCapsFreeStringList(ncaps, caps); virStringListFreeCount(caps, ncaps);
return 0; return 0;
} }