[libvirt] [PATCH v13 39/49] extract general code of NodeDeviceReset
Signed-off-by: Chunyan Liu <cyliu(a)suse.com>
---
src/qemu/qemu_driver.c | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 1b81689..44ac556 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -11400,6 +11400,25 @@ cleanup:
}
static int
+virHostdevPciNodeDeviceReset(virHostdevManagerPtr hostdev_mgr,
+ virPCIDevicePtr pci)
+{
+ int ret = -1;
+ virObjectLock(hostdev_mgr->activePciHostdevs);
+ virObjectLock(hostdev_mgr->inactivePciHostdevs);
+ if (virPCIDeviceReset(pci, hostdev_mgr->activePciHostdevs,
+ hostdev_mgr->inactivePciHostdevs) < 0)
+ goto out;
+
+ ret = 0;
+out:
+ virObjectUnlock(hostdev_mgr->inactivePciHostdevs);
+ virObjectUnlock(hostdev_mgr->activePciHostdevs);
+ return ret;
+}
+
+
+static int
qemuNodeDeviceReset(virNodeDevicePtr dev)
{
virPCIDevicePtr pci;
@@ -11430,16 +11449,8 @@ qemuNodeDeviceReset(virNodeDevicePtr dev)
hostdev_mgr = virHostdevManagerGetDefault();
if (hostdev_mgr == NULL)
goto cleanup_pci;
- virObjectLock(hostdev_mgr->activePciHostdevs);
- virObjectLock(hostdev_mgr->inactivePciHostdevs);
- if (virPCIDeviceReset(pci, hostdev_mgr->activePciHostdevs,
- hostdev_mgr->inactivePciHostdevs) < 0)
- goto out;
+ ret = virHostdevPciNodeDeviceReset(hostdev_mgr, pci);
- ret = 0;
-out:
- virObjectUnlock(hostdev_mgr->inactivePciHostdevs);
- virObjectUnlock(hostdev_mgr->activePciHostdevs);
cleanup_pci:
virPCIDeviceFree(pci);
cleanup:
--
1.6.0.2