External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-04-01 20:05:19 +00:00
Code

nodedev|test: Implement support for validating node device XMLs

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Peter Krempa 2022-10-18 13:41:04 +02:00
parent d8791c3c7c
commit 295908688d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/node_device/node_device_driver.c
View File

@ -879,8 +879,9 @@ nodeDeviceCreateXML(virConnectPtr conn,
g_autofree char *wwpn = NULL;
virNodeDevicePtr device = NULL;
const char *virt_type = NULL;
bool validate = flags & VIR_NODE_DEVICE_CREATE_XML_VALIDATE;
virCheckFlags(0, NULL);
virCheckFlags(VIR_NODE_DEVICE_CREATE_XML_VALIDATE, NULL);
if (nodeDeviceInitWait() < 0)
return NULL;
@ -888,7 +889,7 @@ nodeDeviceCreateXML(virConnectPtr conn,
virt_type = virConnectGetType(conn);
if (!(def = virNodeDeviceDefParse(xmlDesc, NULL, CREATE_DEVICE, virt_type,
&driver->parserCallbacks, NULL, false)))
&driver->parserCallbacks, NULL, validate)))
return NULL;
if (virNodeDeviceCreateXMLEnsureACL(conn, def) < 0)
@ -1400,8 +1401,9 @@ nodeDeviceDefineXML(virConnect *conn,
const char *virt_type = NULL;
g_autofree char *uuid = NULL;
g_autofree char *name = NULL;
bool validate = flags & VIR_NODE_DEVICE_DEFINE_XML_VALIDATE;
virCheckFlags(0, NULL);
virCheckFlags(VIR_NODE_DEVICE_DEFINE_XML_VALIDATE, NULL);
if (nodeDeviceInitWait() < 0)
return NULL;
@ -1409,7 +1411,7 @@ nodeDeviceDefineXML(virConnect *conn,
virt_type = virConnectGetType(conn);
if (!(def = virNodeDeviceDefParse(xmlDesc, NULL, CREATE_DEVICE, virt_type,
&driver->parserCallbacks, NULL, false)))
&driver->parserCallbacks, NULL, validate)))
return NULL;
if (virNodeDeviceDefineXMLEnsureACL(conn, def) < 0)

6
src/test/test_driver.c
View File

@ -7688,10 +7688,12 @@ testNodeDeviceCreateXML(virConnectPtr conn,
virNodeDeviceDef *objdef;
g_autofree char *wwnn = NULL;
g_autofree char *wwpn = NULL;
bool validate = flags & VIR_NODE_DEVICE_CREATE_XML_VALIDATE;
virCheckFlags(0, NULL);
virCheckFlags(VIR_NODE_DEVICE_CREATE_XML_VALIDATE, NULL);
if (!(def = virNodeDeviceDefParse(xmlDesc, NULL, CREATE_DEVICE, NULL, NULL, NULL, false)))
if (!(def = virNodeDeviceDefParse(xmlDesc, NULL, CREATE_DEVICE, NULL, NULL,
NULL, validate)))
goto cleanup;
/* We run this simply for validation - it essentially validates that