提交 4670f062 编写于 作者: J Jonathon Jongsma 提交者: Cole Robinson

conf: use glib allocation when parsing video props

In preparation for some other improvements, switch to using glib
allocation and g_autofree when parsing the 'acceleration' and
'resolution' properties of the video device.
Reviewed-by: NCole Robinson <crobinso@redhat.com>
Signed-off-by: NJonathon Jongsma <jjongsma@redhat.com>
上级 90c737bb
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册