mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-22 22:13:18 +00:00
conf: introduce virDomainGraphicsNew
A helper function for allocating the virDomainGraphicsDef structure. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
parent
388998ac76
commit
c2b7a5f23d
@ -14115,9 +14115,22 @@ virDomainGraphicsDefParseXMLEGLHeadless(virDomainGraphicsDefPtr def,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
virDomainGraphicsDefPtr
|
||||||
|
virDomainGraphicsDefNew(virDomainXMLOptionPtr xmlopt ATTRIBUTE_UNUSED)
|
||||||
|
{
|
||||||
|
virDomainGraphicsDefPtr def = NULL;
|
||||||
|
|
||||||
|
if (VIR_ALLOC(def) < 0)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
return def;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Parse the XML definition for a graphics device */
|
/* Parse the XML definition for a graphics device */
|
||||||
static virDomainGraphicsDefPtr
|
static virDomainGraphicsDefPtr
|
||||||
virDomainGraphicsDefParseXML(xmlNodePtr node,
|
virDomainGraphicsDefParseXML(virDomainXMLOptionPtr xmlopt,
|
||||||
|
xmlNodePtr node,
|
||||||
xmlXPathContextPtr ctxt,
|
xmlXPathContextPtr ctxt,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
@ -14125,7 +14138,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node,
|
|||||||
char *type = NULL;
|
char *type = NULL;
|
||||||
int typeVal;
|
int typeVal;
|
||||||
|
|
||||||
if (VIR_ALLOC(def) < 0)
|
if (!(def = virDomainGraphicsDefNew(xmlopt)))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
type = virXMLPropString(node, "type");
|
type = virXMLPropString(node, "type");
|
||||||
@ -16237,7 +16250,8 @@ virDomainDeviceDefParse(const char *xmlStr,
|
|||||||
goto error;
|
goto error;
|
||||||
break;
|
break;
|
||||||
case VIR_DOMAIN_DEVICE_GRAPHICS:
|
case VIR_DOMAIN_DEVICE_GRAPHICS:
|
||||||
if (!(dev->data.graphics = virDomainGraphicsDefParseXML(node, ctxt, flags)))
|
if (!(dev->data.graphics = virDomainGraphicsDefParseXML(xmlopt, node,
|
||||||
|
ctxt, flags)))
|
||||||
goto error;
|
goto error;
|
||||||
break;
|
break;
|
||||||
case VIR_DOMAIN_DEVICE_HUB:
|
case VIR_DOMAIN_DEVICE_HUB:
|
||||||
@ -20847,7 +20861,8 @@ virDomainDefParseXML(xmlDocPtr xml,
|
|||||||
if (n && VIR_ALLOC_N(def->graphics, n) < 0)
|
if (n && VIR_ALLOC_N(def->graphics, n) < 0)
|
||||||
goto error;
|
goto error;
|
||||||
for (i = 0; i < n; i++) {
|
for (i = 0; i < n; i++) {
|
||||||
virDomainGraphicsDefPtr graphics = virDomainGraphicsDefParseXML(nodes[i],
|
virDomainGraphicsDefPtr graphics = virDomainGraphicsDefParseXML(xmlopt,
|
||||||
|
nodes[i],
|
||||||
ctxt,
|
ctxt,
|
||||||
flags);
|
flags);
|
||||||
if (!graphics)
|
if (!graphics)
|
||||||
|
@ -2954,6 +2954,8 @@ virDomainChrSourceDefNew(virDomainXMLOptionPtr xmlopt);
|
|||||||
|
|
||||||
virDomainChrDefPtr virDomainChrDefNew(virDomainXMLOptionPtr xmlopt);
|
virDomainChrDefPtr virDomainChrDefNew(virDomainXMLOptionPtr xmlopt);
|
||||||
|
|
||||||
|
virDomainGraphicsDefPtr
|
||||||
|
virDomainGraphicsDefNew(virDomainXMLOptionPtr xmlopt);
|
||||||
virDomainDefPtr virDomainDefNew(void);
|
virDomainDefPtr virDomainDefNew(void);
|
||||||
|
|
||||||
void virDomainObjAssignDef(virDomainObjPtr domain,
|
void virDomainObjAssignDef(virDomainObjPtr domain,
|
||||||
|
Loading…
Reference in New Issue
Block a user