External/libvirt
1
0
Fork 0
Code

test: Sync GetXML INACTIVE behavior with live driver

Browse Source 
- Error if INACTIVE requested for transient object
- Force dumping INACTIVE XML when object is inactive

Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2024-04-17 11:07:14 -04:00
parent 2b487f564e
commit 8ee34bb551
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/test/test_driver.c
View File

@ -7514,15 +7514,30 @@ testNodeDeviceGetXMLDesc(virNodeDevicePtr dev,
{ {
testDriver *driver = dev->conn->privateData; testDriver *driver = dev->conn->privateData;
virNodeDeviceObj *obj; virNodeDeviceObj *obj;
virNodeDeviceDef *def;
char *ret = NULL; char *ret = NULL;
virCheckFlags(VIR_NODE_DEVICE_XML_INACTIVE, NULL); virCheckFlags(VIR_NODE_DEVICE_XML_INACTIVE, NULL);
if (!(obj = testNodeDeviceObjFindByName(driver, dev->name))) if (!(obj = testNodeDeviceObjFindByName(driver, dev->name)))
return NULL; return NULL;
def = virNodeDeviceObjGetDef(obj);
ret = virNodeDeviceDefFormat(virNodeDeviceObjGetDef(obj), flags); if (flags & VIR_NODE_DEVICE_XML_INACTIVE) {
if (!virNodeDeviceObjIsPersistent(obj)) {
virReportError(VIR_ERR_OPERATION_INVALID,
_("node device '%1$s' is not persistent"),
def->name);
goto cleanup;
}
} else {
if (!virNodeDeviceObjIsActive(obj))
flags |= VIR_NODE_DEVICE_XML_INACTIVE;
}
ret = virNodeDeviceDefFormat(def, flags);
cleanup:
virNodeDeviceObjEndAPI(&obj); virNodeDeviceObjEndAPI(&obj);
return ret; return ret;
} }