diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 921780f72b..b8df4591b3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15257,7 +15257,7 @@ static virDomainVideoAccelDefPtr virDomainVideoAccelDefParseXML(xmlNodePtr node) { xmlNodePtr cur; - virDomainVideoAccelDefPtr def; + g_autofree virDomainVideoAccelDefPtr def = NULL; int val; g_autofree char *accel2d = NULL; g_autofree char *accel3d = NULL; @@ -15279,8 +15279,7 @@ virDomainVideoAccelDefParseXML(xmlNodePtr node) if (!accel3d && !accel2d && !rendernode) return NULL; - if (VIR_ALLOC(def) < 0) - goto cleanup; + def = g_new0(virDomainVideoAccelDef, 1); if (accel3d) { if ((val = virTristateBoolTypeFromString(accel3d)) <= 0) { @@ -15304,14 +15303,14 @@ virDomainVideoAccelDefParseXML(xmlNodePtr node) def->rendernode = virFileSanitizePath(rendernode); cleanup: - return def; + return g_steal_pointer(&def); } static virDomainVideoResolutionDefPtr virDomainVideoResolutionDefParseXML(xmlNodePtr node) { xmlNodePtr cur; - virDomainVideoResolutionDefPtr def; + g_autofree virDomainVideoResolutionDefPtr def = NULL; g_autofree char *x = NULL; g_autofree char *y = NULL; @@ -15330,8 +15329,7 @@ virDomainVideoResolutionDefParseXML(xmlNodePtr node) if (!x || !y) return NULL; - if (VIR_ALLOC(def) < 0) - goto cleanup; + def = g_new0(virDomainVideoResolutionDef, 1); if (virStrToLong_uip(x, NULL, 10, &def->x) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -15346,7 +15344,7 @@ virDomainVideoResolutionDefParseXML(xmlNodePtr node) } cleanup: - return def; + return g_steal_pointer(&def); } static virDomainVideoDriverDefPtr