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

cpu: Use g_auto* in virCPUGetHost

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Tim Wiederhake 2020-09-07 16:58:56 +02:00 committed by Ján Tomko
parent ca1c9716cc
commit d369264a99
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/cpu/cpu.c
View File

@ -378,7 +378,7 @@ virCPUGetHost(virArch arch,
virDomainCapsCPUModelsPtr models) virDomainCapsCPUModelsPtr models)
{ {
struct cpuArchDriver *driver; struct cpuArchDriver *driver;
virCPUDefPtr cpu = NULL; g_autoptr(virCPUDef) cpu = NULL;
VIR_DEBUG("arch=%s, type=%s, nodeInfo=%p, models=%p", VIR_DEBUG("arch=%s, type=%s, nodeInfo=%p, models=%p",
virArchToString(arch), virCPUTypeToString(type), nodeInfo, virArchToString(arch), virCPUTypeToString(type), nodeInfo,
@ -400,7 +400,7 @@ virCPUGetHost(virArch arch,
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("cannot set topology for CPU type '%s'"), _("cannot set topology for CPU type '%s'"),
virCPUTypeToString(type)); virCPUTypeToString(type));
goto error; return NULL;
} }
cpu->type = type; cpu->type = type;
break; break;
@ -410,7 +410,7 @@ virCPUGetHost(virArch arch,
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("unsupported CPU type: %s"), _("unsupported CPU type: %s"),
virCPUTypeToString(type)); virCPUTypeToString(type));
goto error; return NULL;
} }
if (nodeInfo) { if (nodeInfo) {
@ -424,9 +424,8 @@ virCPUGetHost(virArch arch,
* filled in. * filled in.
*/ */
if (driver->getHost) { if (driver->getHost) {
if (driver->getHost(cpu, models) < 0 && if (driver->getHost(cpu, models) < 0 && !nodeInfo)
!nodeInfo) return NULL;
goto error;
} else if (nodeInfo) { } else if (nodeInfo) {
VIR_DEBUG("cannot detect host CPU model for %s architecture", VIR_DEBUG("cannot detect host CPU model for %s architecture",
virArchToString(arch)); virArchToString(arch));
@ -434,14 +433,10 @@ virCPUGetHost(virArch arch,
virReportError(VIR_ERR_NO_SUPPORT, virReportError(VIR_ERR_NO_SUPPORT,
_("cannot detect host CPU model for %s architecture"), _("cannot detect host CPU model for %s architecture"),
virArchToString(arch)); virArchToString(arch));
goto error; return NULL;
} }
return cpu; return g_steal_pointer(&cpu);
error:
virCPUDefFree(cpu);
return NULL;
} }