mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
qemu, libxl, hypervisor: use virDomainDriverNodeDeviceReAttach() helper
libxlNodeDeviceReAttach() and qemuNodeDeviceReAttach() are mostly equal, differing only how the virHostdevManager pointer is retrieved. Put the common code into virDomainDriverNodeDeviceReAttach() to reduce code duplication. Reviewed-by: Ján Tomko <jtomko@redhat.com> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
parent
89450b5e73
commit
23cdab6a3d
@ -414,3 +414,56 @@ virDomainDriverNodeDeviceReset(virNodeDevicePtr dev,
|
||||
|
||||
return virHostdevPCINodeDeviceReset(hostdevMgr, pci);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virDomainDriverNodeDeviceReAttach(virNodeDevicePtr dev,
|
||||
virHostdevManagerPtr hostdevMgr)
|
||||
{
|
||||
virPCIDevicePtr pci = NULL;
|
||||
virPCIDeviceAddress devAddr;
|
||||
int ret = -1;
|
||||
virNodeDeviceDefPtr def = NULL;
|
||||
g_autofree char *xml = NULL;
|
||||
virConnectPtr nodeconn = NULL;
|
||||
virNodeDevicePtr nodedev = NULL;
|
||||
|
||||
if (!(nodeconn = virGetConnectNodeDev()))
|
||||
goto cleanup;
|
||||
|
||||
/* 'dev' is associated with virConnectPtr, so for split
|
||||
* daemons, we need to get a copy that is associated with
|
||||
* the virnodedevd daemon. */
|
||||
if (!(nodedev = virNodeDeviceLookupByName(
|
||||
nodeconn, virNodeDeviceGetName(dev))))
|
||||
goto cleanup;
|
||||
|
||||
xml = virNodeDeviceGetXMLDesc(nodedev, 0);
|
||||
if (!xml)
|
||||
goto cleanup;
|
||||
|
||||
def = virNodeDeviceDefParseString(xml, EXISTING_DEVICE, NULL);
|
||||
if (!def)
|
||||
goto cleanup;
|
||||
|
||||
/* ACL check must happen against original 'dev',
|
||||
* not the new 'nodedev' we acquired */
|
||||
if (virNodeDeviceReAttachEnsureACL(dev->conn, def) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virDomainDriverNodeDeviceGetPCIInfo(def, &devAddr) < 0)
|
||||
goto cleanup;
|
||||
|
||||
pci = virPCIDeviceNew(&devAddr);
|
||||
if (!pci)
|
||||
goto cleanup;
|
||||
|
||||
ret = virHostdevPCINodeDeviceReAttach(hostdevMgr, pci);
|
||||
|
||||
virPCIDeviceFree(pci);
|
||||
cleanup:
|
||||
virNodeDeviceDefFree(def);
|
||||
virObjectUnref(nodedev);
|
||||
virObjectUnref(nodeconn);
|
||||
return ret;
|
||||
}
|
||||
|
@ -53,3 +53,6 @@ int virDomainDriverNodeDeviceGetPCIInfo(virNodeDeviceDefPtr def,
|
||||
|
||||
int virDomainDriverNodeDeviceReset(virNodeDevicePtr dev,
|
||||
virHostdevManagerPtr hostdevMgr);
|
||||
|
||||
int virDomainDriverNodeDeviceReAttach(virNodeDevicePtr dev,
|
||||
virHostdevManagerPtr hostdevMgr);
|
||||
|
@ -1508,6 +1508,7 @@ virDomainDriverGenerateMachineName;
|
||||
virDomainDriverGenerateRootHash;
|
||||
virDomainDriverMergeBlkioDevice;
|
||||
virDomainDriverNodeDeviceGetPCIInfo;
|
||||
virDomainDriverNodeDeviceReAttach;
|
||||
virDomainDriverNodeDeviceReset;
|
||||
virDomainDriverParseBlkioDeviceStr;
|
||||
virDomainDriverSetupPersistentDefBlkioParams;
|
||||
|
@ -5844,58 +5844,12 @@ libxlNodeDeviceDettach(virNodeDevicePtr dev)
|
||||
static int
|
||||
libxlNodeDeviceReAttach(virNodeDevicePtr dev)
|
||||
{
|
||||
virPCIDevicePtr pci = NULL;
|
||||
virPCIDeviceAddress devAddr;
|
||||
int ret = -1;
|
||||
virNodeDeviceDefPtr def = NULL;
|
||||
g_autofree char *xml = NULL;
|
||||
libxlDriverPrivatePtr driver = dev->conn->privateData;
|
||||
virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
|
||||
virConnectPtr nodeconn = NULL;
|
||||
virNodeDevicePtr nodedev = NULL;
|
||||
|
||||
if (!(nodeconn = virGetConnectNodeDev()))
|
||||
goto cleanup;
|
||||
|
||||
/* 'dev' is associated with the QEMU virConnectPtr,
|
||||
* so for split daemons, we need to get a copy that
|
||||
* is associated with the virnodedevd daemon.
|
||||
*/
|
||||
if (!(nodedev = virNodeDeviceLookupByName(
|
||||
nodeconn, virNodeDeviceGetName(dev))))
|
||||
goto cleanup;
|
||||
|
||||
xml = virNodeDeviceGetXMLDesc(nodedev, 0);
|
||||
if (!xml)
|
||||
goto cleanup;
|
||||
|
||||
def = virNodeDeviceDefParseString(xml, EXISTING_DEVICE, NULL);
|
||||
if (!def)
|
||||
goto cleanup;
|
||||
|
||||
/* ACL check must happen against original 'dev',
|
||||
* not the new 'nodedev' we acquired */
|
||||
if (virNodeDeviceReAttachEnsureACL(dev->conn, def) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virDomainDriverNodeDeviceGetPCIInfo(def, &devAddr) < 0)
|
||||
goto cleanup;
|
||||
|
||||
pci = virPCIDeviceNew(&devAddr);
|
||||
if (!pci)
|
||||
goto cleanup;
|
||||
|
||||
if (virHostdevPCINodeDeviceReAttach(hostdev_mgr, pci) < 0)
|
||||
goto cleanup;
|
||||
|
||||
ret = 0;
|
||||
|
||||
cleanup:
|
||||
virPCIDeviceFree(pci);
|
||||
virNodeDeviceDefFree(def);
|
||||
virObjectUnref(nodedev);
|
||||
virObjectUnref(nodeconn);
|
||||
return ret;
|
||||
/* virNodeDeviceReAttachEnsureACL() is being called by
|
||||
* virDomainDriverNodeDeviceReAttach() */
|
||||
return virDomainDriverNodeDeviceReAttach(dev, hostdev_mgr);
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -12082,54 +12082,11 @@ static int
|
||||
qemuNodeDeviceReAttach(virNodeDevicePtr dev)
|
||||
{
|
||||
virQEMUDriverPtr driver = dev->conn->privateData;
|
||||
virPCIDevicePtr pci = NULL;
|
||||
virPCIDeviceAddress devAddr;
|
||||
int ret = -1;
|
||||
virNodeDeviceDefPtr def = NULL;
|
||||
g_autofree char *xml = NULL;
|
||||
virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
|
||||
virConnectPtr nodeconn = NULL;
|
||||
virNodeDevicePtr nodedev = NULL;
|
||||
|
||||
if (!(nodeconn = virGetConnectNodeDev()))
|
||||
goto cleanup;
|
||||
|
||||
/* 'dev' is associated with the QEMU virConnectPtr,
|
||||
* so for split daemons, we need to get a copy that
|
||||
* is associated with the virnodedevd daemon.
|
||||
*/
|
||||
if (!(nodedev = virNodeDeviceLookupByName(
|
||||
nodeconn, virNodeDeviceGetName(dev))))
|
||||
goto cleanup;
|
||||
|
||||
xml = virNodeDeviceGetXMLDesc(nodedev, 0);
|
||||
if (!xml)
|
||||
goto cleanup;
|
||||
|
||||
def = virNodeDeviceDefParseString(xml, EXISTING_DEVICE, NULL);
|
||||
if (!def)
|
||||
goto cleanup;
|
||||
|
||||
/* ACL check must happen against original 'dev',
|
||||
* not the new 'nodedev' we acquired */
|
||||
if (virNodeDeviceReAttachEnsureACL(dev->conn, def) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virDomainDriverNodeDeviceGetPCIInfo(def, &devAddr) < 0)
|
||||
goto cleanup;
|
||||
|
||||
pci = virPCIDeviceNew(&devAddr);
|
||||
if (!pci)
|
||||
goto cleanup;
|
||||
|
||||
ret = virHostdevPCINodeDeviceReAttach(hostdev_mgr, pci);
|
||||
|
||||
virPCIDeviceFree(pci);
|
||||
cleanup:
|
||||
virNodeDeviceDefFree(def);
|
||||
virObjectUnref(nodedev);
|
||||
virObjectUnref(nodeconn);
|
||||
return ret;
|
||||
/* virNodeDeviceReAttachEnsureACL() is being called by
|
||||
* virDomainDriverNodeDeviceReAttach() */
|
||||
return virDomainDriverNodeDeviceReAttach(dev, hostdev_mgr);
|
||||
}
|
||||
|
||||
static int
|
||||
|
Loading…
x
Reference in New Issue
Block a user