External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-24 05:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

virQEMUCapsProcessStringFlags: Don't require 'nvalues'

Browse Source 
All callers pass in NULL-terminated string lists. Remove the 'nvalues'
argument and fix all callers.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-06-14 15:37:46 +02:00
parent 651f77f898
commit b20ef5e6de
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/qemu/qemu_capabilities.c
View File

@ -1772,16 +1772,17 @@ static void
virQEMUCapsProcessStringFlags(virQEMUCaps *qemuCaps, virQEMUCapsProcessStringFlags(virQEMUCaps *qemuCaps,
size_t nflags, size_t nflags,
struct virQEMUCapsStringFlags *flags, struct virQEMUCapsStringFlags *flags,
size_t nvalues, char **values)
char *const*values)
{ {
size_t i, j; size_t i;
char **value;
for (i = 0; i < nflags; i++) { for (i = 0; i < nflags; i++) {
if (virQEMUCapsGet(qemuCaps, flags[i].flag)) if (virQEMUCapsGet(qemuCaps, flags[i].flag))
continue; continue;
for (j = 0; j < nvalues; j++) { for (value = values; *value; value++) {
if (STREQ(values[j], flags[i].value)) { if (STREQ(*value, flags[i].value)) {
virQEMUCapsSet(qemuCaps, flags[i].flag); virQEMUCapsSet(qemuCaps, flags[i].flag);
break; break;
} }
@ -2558,15 +2559,14 @@ virQEMUCapsProbeQMPCommands(virQEMUCaps *qemuCaps,
qemuMonitor *mon) qemuMonitor *mon)
{ {
g_auto(GStrv) commands = NULL; g_auto(GStrv) commands = NULL;
int ncommands;
if ((ncommands = qemuMonitorGetCommands(mon, &commands)) < 0) if (qemuMonitorGetCommands(mon, &commands) < 0)
return -1; return -1;
virQEMUCapsProcessStringFlags(qemuCaps, virQEMUCapsProcessStringFlags(qemuCaps,
G_N_ELEMENTS(virQEMUCapsCommands), G_N_ELEMENTS(virQEMUCapsCommands),
virQEMUCapsCommands, virQEMUCapsCommands,
ncommands, commands); commands);
return 0; return 0;
} }
@ -2577,14 +2577,13 @@ virQEMUCapsProbeQMPObjectTypes(virQEMUCaps *qemuCaps,
qemuMonitor *mon) qemuMonitor *mon)
{ {
g_auto(GStrv) values = NULL; g_auto(GStrv) values = NULL;
int nvalues;
if ((nvalues = qemuMonitorGetObjectTypes(mon, &values)) < 0) if (qemuMonitorGetObjectTypes(mon, &values) < 0)
return -1; return -1;
virQEMUCapsProcessStringFlags(qemuCaps, virQEMUCapsProcessStringFlags(qemuCaps,
G_N_ELEMENTS(virQEMUCapsObjectTypes), G_N_ELEMENTS(virQEMUCapsObjectTypes),
virQEMUCapsObjectTypes, virQEMUCapsObjectTypes,
nvalues, values); values);
return 0; return 0;
} }
@ -2638,19 +2637,18 @@ virQEMUCapsProbeQMPObjectProperties(virQEMUCaps *qemuCaps,
for (i = 0; i < G_N_ELEMENTS(virQEMUCapsObjectProps); i++) { for (i = 0; i < G_N_ELEMENTS(virQEMUCapsObjectProps); i++) {
virQEMUCapsObjectTypeProps *props = virQEMUCapsObjectProps + i; virQEMUCapsObjectTypeProps *props = virQEMUCapsObjectProps + i;
g_auto(GStrv) values = NULL; g_auto(GStrv) values = NULL;
int nvalues;
if (props->capsCondition >= 0 && if (props->capsCondition >= 0 &&
!virQEMUCapsGet(qemuCaps, props->capsCondition)) !virQEMUCapsGet(qemuCaps, props->capsCondition))
continue; continue;
if ((nvalues = qemuMonitorGetObjectProps(mon, props->type, &values)) < 0) if (qemuMonitorGetObjectProps(mon, props->type, &values) < 0)
return -1; return -1;
virQEMUCapsProcessStringFlags(qemuCaps, virQEMUCapsProcessStringFlags(qemuCaps,
props->nprops, props->nprops,
props->props, props->props,
nvalues, values); values);
} }
return 0; return 0;
@ -2864,7 +2862,6 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCaps *qemuCaps,
const char *canon = virQEMUCapsGetCanonicalMachine(qemuCaps, virtType, props.type); const char *canon = virQEMUCapsGetCanonicalMachine(qemuCaps, virtType, props.type);
g_autofree char *type = NULL; g_autofree char *type = NULL;
g_auto(GStrv) values = NULL; g_auto(GStrv) values = NULL;
int nvalues;
if (STRNEQ(canon, "none") && if (STRNEQ(canon, "none") &&
!virQEMUCapsIsMachineSupported(qemuCaps, virtType, canon)) { !virQEMUCapsIsMachineSupported(qemuCaps, virtType, canon)) {
@ -2875,13 +2872,13 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCaps *qemuCaps,
* followed by the -machine suffix */ * followed by the -machine suffix */
type = g_strdup_printf("%s-machine", canon); type = g_strdup_printf("%s-machine", canon);
if ((nvalues = qemuMonitorGetObjectProps(mon, type, &values)) < 0) if (qemuMonitorGetObjectProps(mon, type, &values) < 0)
return -1; return -1;
virQEMUCapsProcessStringFlags(qemuCaps, virQEMUCapsProcessStringFlags(qemuCaps,
props.nprops, props.nprops,
props.props, props.props,
nvalues, values); values);
} }
return 0; return 0;
@ -3299,15 +3296,14 @@ virQEMUCapsProbeQMPMigrationCapabilities(virQEMUCaps *qemuCaps,
qemuMonitor *mon) qemuMonitor *mon)
{ {
g_auto(GStrv) caps = NULL; g_auto(GStrv) caps = NULL;
int ncaps;
if ((ncaps = qemuMonitorGetMigrationCapabilities(mon, &caps)) < 0) if (qemuMonitorGetMigrationCapabilities(mon, &caps) < 0)
return -1; return -1;
virQEMUCapsProcessStringFlags(qemuCaps, virQEMUCapsProcessStringFlags(qemuCaps,
G_N_ELEMENTS(virQEMUCapsMigration), G_N_ELEMENTS(virQEMUCapsMigration),
virQEMUCapsMigration, virQEMUCapsMigration,
ncaps, caps); caps);
return 0; return 0;
} }