mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 06:05:27 +00:00
virQEMUCapsProbeQMPTPM: Refactor handling of string lists
This refactors multiple aspects of the function: 1) Use automatic memory freeing 2) Remove need to check element count in the returned arrays 3) Fixes questionable code linebreaks 4) Removes reuse of variables Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
b20ef5e6de
commit
a5bc5f0ecf
@ -3160,36 +3160,27 @@ static int
|
||||
virQEMUCapsProbeQMPTPM(virQEMUCaps *qemuCaps,
|
||||
qemuMonitor *mon)
|
||||
{
|
||||
int nentries;
|
||||
g_auto(GStrv) models = NULL;
|
||||
g_auto(GStrv) types = NULL;
|
||||
size_t i;
|
||||
char **entries = NULL;
|
||||
|
||||
if ((nentries = qemuMonitorGetTPMModels(mon, &entries)) < 0)
|
||||
if (qemuMonitorGetTPMModels(mon, &models) < 0)
|
||||
return -1;
|
||||
|
||||
if (nentries > 0) {
|
||||
for (i = 0; i < G_N_ELEMENTS(virQEMUCapsTPMModelsToCaps); i++) {
|
||||
const char *needle = virDomainTPMModelTypeToString(
|
||||
virQEMUCapsTPMModelsToCaps[i].type);
|
||||
if (g_strv_contains((const char **)entries, needle))
|
||||
virQEMUCapsSet(qemuCaps,
|
||||
virQEMUCapsTPMModelsToCaps[i].caps);
|
||||
}
|
||||
for (i = 0; i < G_N_ELEMENTS(virQEMUCapsTPMModelsToCaps); i++) {
|
||||
const char *needle = virDomainTPMModelTypeToString(virQEMUCapsTPMModelsToCaps[i].type);
|
||||
if (g_strv_contains((const char **)models, needle))
|
||||
virQEMUCapsSet(qemuCaps, virQEMUCapsTPMModelsToCaps[i].caps);
|
||||
}
|
||||
g_strfreev(entries);
|
||||
|
||||
if ((nentries = qemuMonitorGetTPMTypes(mon, &entries)) < 0)
|
||||
if (qemuMonitorGetTPMTypes(mon, &types) < 0)
|
||||
return -1;
|
||||
|
||||
if (nentries > 0) {
|
||||
for (i = 0; i < G_N_ELEMENTS(virQEMUCapsTPMTypesToCaps); i++) {
|
||||
const char *needle = virDomainTPMBackendTypeToString(
|
||||
virQEMUCapsTPMTypesToCaps[i].type);
|
||||
if (g_strv_contains((const char **)entries, needle))
|
||||
virQEMUCapsSet(qemuCaps, virQEMUCapsTPMTypesToCaps[i].caps);
|
||||
}
|
||||
for (i = 0; i < G_N_ELEMENTS(virQEMUCapsTPMTypesToCaps); i++) {
|
||||
const char *needle = virDomainTPMBackendTypeToString(virQEMUCapsTPMTypesToCaps[i].type);
|
||||
if (g_strv_contains((const char **)types, needle))
|
||||
virQEMUCapsSet(qemuCaps, virQEMUCapsTPMTypesToCaps[i].caps);
|
||||
}
|
||||
g_strfreev(entries);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user