External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-30 11:25:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: networkportdef: Provide only virNetworkPortDefParse

Browse Source 
Replace the two helpers virNetworkPortDefParseString/File with the
common helper.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-09-22 16:09:27 +02:00
parent 0589afb96b
commit ed080445a6
7 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/domain_conf.c
View File

@ -29537,7 +29537,7 @@ virDomainNetCreatePort(virConnectPtr conn,
VIR_FREE(portxml); VIR_FREE(portxml);
if (!(portxml = virNetworkPortGetXMLDesc(port, 0)) || if (!(portxml = virNetworkPortGetXMLDesc(port, 0)) ||
!(portdef = virNetworkPortDefParseString(portxml, 0)) || !(portdef = virNetworkPortDefParse(portxml, NULL, 0)) ||
virDomainNetDefActualFromNetworkPort(iface, portdef) < 0) { virDomainNetDefActualFromNetworkPort(iface, portdef) < 0) {
virErrorPreserveLast(&save_err); virErrorPreserveLast(&save_err);
virNetworkPortDelete(port, 0); virNetworkPortDelete(port, 0);

2
src/conf/virnetworkobj.c
View File

@ -1833,7 +1833,7 @@ virNetworkObjLoadAllPorts(virNetworkObj *net,
file = g_strdup_printf("%s/%s.xml", dir, de->d_name); file = g_strdup_printf("%s/%s.xml", dir, de->d_name);
portdef = virNetworkPortDefParseFile(file); portdef = virNetworkPortDefParse(NULL, file, 0);
if (!portdef) { if (!portdef) {
VIR_WARN("Cannot parse port %s", file); VIR_WARN("Cannot parse port %s", file);
continue; continue;

17
src/conf/virnetworkportdef.c
View File

@ -251,7 +251,7 @@ virNetworkPortDefParseXML(xmlXPathContextPtr ctxt)
} }
static virNetworkPortDef * virNetworkPortDef *
virNetworkPortDefParse(const char *xmlStr, virNetworkPortDefParse(const char *xmlStr,
const char *filename, const char *filename,
unsigned int flags) unsigned int flags)
@ -268,21 +268,6 @@ virNetworkPortDefParse(const char *xmlStr,
} }
virNetworkPortDef *
virNetworkPortDefParseString(const char *xmlStr,
unsigned int flags)
{
return virNetworkPortDefParse(xmlStr, NULL, flags);
}
virNetworkPortDef *
virNetworkPortDefParseFile(const char *filename)
{
return virNetworkPortDefParse(NULL, filename, 0);
}
char * char *
virNetworkPortDefFormat(const virNetworkPortDef *def) virNetworkPortDefFormat(const virNetworkPortDef *def)
{ {

8
src/conf/virnetworkportdef.h
View File

@ -81,11 +81,9 @@ virNetworkPortDefFree(virNetworkPortDef *port);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetworkPortDef, virNetworkPortDefFree); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetworkPortDef, virNetworkPortDefFree);
virNetworkPortDef * virNetworkPortDef *
virNetworkPortDefParseString(const char *xml, virNetworkPortDefParse(const char *xmlStr,
unsigned int flags); const char *filename,
unsigned int flags);
virNetworkPortDef *
virNetworkPortDefParseFile(const char *filename);
char * char *
virNetworkPortDefFormat(const virNetworkPortDef *def); virNetworkPortDefFormat(const virNetworkPortDef *def);

3
src/libvirt_private.syms
View File

@ -1326,8 +1326,7 @@ virNetworkObjUpdateAssignDef;
virNetworkPortDefFormat; virNetworkPortDefFormat;
virNetworkPortDefFormatBuf; virNetworkPortDefFormatBuf;
virNetworkPortDefFree; virNetworkPortDefFree;
virNetworkPortDefParseFile; virNetworkPortDefParse;
virNetworkPortDefParseString;
virNetworkPortDefSaveStatus; virNetworkPortDefSaveStatus;

2
src/network/bridge_driver.c
View File

@ -4844,7 +4844,7 @@ networkPortCreateXML(virNetworkPtr net,
def = virNetworkObjGetDef(obj); def = virNetworkObjGetDef(obj);
if (!(portdef = virNetworkPortDefParseString(xmldesc, flags))) if (!(portdef = virNetworkPortDefParse(xmldesc, NULL, flags)))
goto cleanup; goto cleanup;
if (virNetworkPortCreateXMLEnsureACL(net->conn, def, portdef) < 0) if (virNetworkPortCreateXMLEnsureACL(net->conn, def, portdef) < 0)

2
tests/virnetworkportxml2xmltest.c
View File

@ -38,7 +38,7 @@ testCompareXMLToXMLFiles(const char *expected)
g_autofree char *actual = NULL; g_autofree char *actual = NULL;
g_autoptr(virNetworkPortDef) dev = NULL; g_autoptr(virNetworkPortDef) dev = NULL;
if (!(dev = virNetworkPortDefParseFile(expected))) if (!(dev = virNetworkPortDefParse(NULL, expected, 0)))
return -1; return -1;
if (!(actual = virNetworkPortDefFormat(dev))) if (!(actual = virNetworkPortDefFormat(dev)))