External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-20 13:09:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

domain_driver.c: use g_auto* in virDomainDriverNodeDeviceReAttach()

Browse Source 
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Daniel Henrique Barboza 2021-01-30 13:57:04 -03:00
parent 23cdab6a3d
commit fc71d91428
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/hypervisor/domain_driver.c
View File

@ -420,50 +420,42 @@ int
virDomainDriverNodeDeviceReAttach(virNodeDevicePtr dev, virDomainDriverNodeDeviceReAttach(virNodeDevicePtr dev,
virHostdevManagerPtr hostdevMgr) virHostdevManagerPtr hostdevMgr)
{ {
virPCIDevicePtr pci = NULL; g_autoptr(virPCIDevice) pci = NULL;
virPCIDeviceAddress devAddr; virPCIDeviceAddress devAddr;
int ret = -1; g_autoptr(virNodeDeviceDef) def = NULL;
virNodeDeviceDefPtr def = NULL;
g_autofree char *xml = NULL; g_autofree char *xml = NULL;
virConnectPtr nodeconn = NULL; g_autoptr(virConnect) nodeconn = NULL;
virNodeDevicePtr nodedev = NULL; g_autoptr(virNodeDevice) nodedev = NULL;
if (!(nodeconn = virGetConnectNodeDev())) if (!(nodeconn = virGetConnectNodeDev()))
goto cleanup; return -1;
/* 'dev' is associated with virConnectPtr, so for split /* 'dev' is associated with virConnectPtr, so for split
* daemons, we need to get a copy that is associated with * daemons, we need to get a copy that is associated with
* the virnodedevd daemon. */ * the virnodedevd daemon. */
if (!(nodedev = virNodeDeviceLookupByName( if (!(nodedev = virNodeDeviceLookupByName(
nodeconn, virNodeDeviceGetName(dev)))) nodeconn, virNodeDeviceGetName(dev))))
goto cleanup; return -1;
xml = virNodeDeviceGetXMLDesc(nodedev, 0); xml = virNodeDeviceGetXMLDesc(nodedev, 0);
if (!xml) if (!xml)
goto cleanup; return -1;
def = virNodeDeviceDefParseString(xml, EXISTING_DEVICE, NULL); def = virNodeDeviceDefParseString(xml, EXISTING_DEVICE, NULL);
if (!def) if (!def)
goto cleanup; return -1;
/* ACL check must happen against original 'dev', /* ACL check must happen against original 'dev',
* not the new 'nodedev' we acquired */ * not the new 'nodedev' we acquired */
if (virNodeDeviceReAttachEnsureACL(dev->conn, def) < 0) if (virNodeDeviceReAttachEnsureACL(dev->conn, def) < 0)
goto cleanup; return -1;
if (virDomainDriverNodeDeviceGetPCIInfo(def, &devAddr) < 0) if (virDomainDriverNodeDeviceGetPCIInfo(def, &devAddr) < 0)
goto cleanup; return -1;
pci = virPCIDeviceNew(&devAddr); pci = virPCIDeviceNew(&devAddr);
if (!pci) if (!pci)
goto cleanup; return -1;
ret = virHostdevPCINodeDeviceReAttach(hostdevMgr, pci); return virHostdevPCINodeDeviceReAttach(hostdevMgr, pci);
virPCIDeviceFree(pci);
cleanup:
virNodeDeviceDefFree(def);
virObjectUnref(nodedev);
virObjectUnref(nodeconn);
return ret;
} }