diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index eb69a3428444b2a97ee008779f2ce17b084bee2e..ba8c17dfe475a8d9ce26bf2386eb7ab68d419a95 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -585,9 +585,10 @@ - - - + + + + diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index 64e6ec8a7b30934310972cfa8fa7775a6b4471c7..c17c8cdfdb6acd800581a1cd28e3a09f15831e8a 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -203,11 +203,11 @@ ppcVendorLoad(xmlXPathContextPtr ctxt, struct ppc_map *map) { struct ppc_vendor *vendor = NULL; - char *string = NULL; - int ret = -1; - if (VIR_ALLOC(vendor) < 0) - goto no_memory; + if (VIR_ALLOC(vendor) < 0) { + virReportOOMError(); + return -1; + } vendor->name = virXPathString("string(@name)", ctxt); if (!vendor->name) { @@ -222,31 +222,19 @@ ppcVendorLoad(xmlXPathContextPtr ctxt, goto ignore; } - string = virXPathString("string(@string)", ctxt); - if (!string) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing vendor string for CPU vendor %s"), vendor->name); - goto ignore; - } - if (!map->vendors) + if (!map->vendors) { map->vendors = vendor; - else { + } else { vendor->next = map->vendors; map->vendors = vendor; } - ret = 0; - -out: - VIR_FREE(string); - return ret; - -no_memory: - virReportOOMError(); +cleanup: + return 0; ignore: ppcVendorFree(vendor); - goto out; + goto cleanup; } static int