qemu: hostdev: Unify naming for qemuHostdevUpdateActive*Devices()

Adopt the same names used for virHostdevUpdateActive*Devices() for
consistency's sake and to make it easier to jump between the two.

No functional changes.

diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 16945c716d9e4c1c53bdbd686f19754a6ebb0aae..7c920c9c67bfa1ff896cb2a15088a6be1005f405 100644 (file)
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -45,8 +45,8 @@ VIR_LOG_INIT("qemu.qemu_hostdev");
 
 
 int
-qemuUpdateActivePCIHostdevs(virQEMUDriverPtr driver,
-                            virDomainDefPtr def)
+qemuHostdevUpdateActivePCIDevices(virQEMUDriverPtr driver,
+                                  virDomainDefPtr def)
 {
     virHostdevManagerPtr mgr = driver->hostdevMgr;
 
@@ -58,8 +58,8 @@ qemuUpdateActivePCIHostdevs(virQEMUDriverPtr driver,
 }
 
 int
-qemuUpdateActiveUSBHostdevs(virQEMUDriverPtr driver,
-                            virDomainDefPtr def)
+qemuHostdevUpdateActiveUSBDevices(virQEMUDriverPtr driver,
+                                  virDomainDefPtr def)
 {
     virHostdevManagerPtr mgr = driver->hostdevMgr;
 
@@ -71,8 +71,8 @@ qemuUpdateActiveUSBHostdevs(virQEMUDriverPtr driver,
 }
 
 int
-qemuUpdateActiveSCSIHostdevs(virQEMUDriverPtr driver,
-                             virDomainDefPtr def)
+qemuHostdevUpdateActiveSCSIDevices(virQEMUDriverPtr driver,
+                                   virDomainDefPtr def)
 {
     virHostdevManagerPtr mgr = driver->hostdevMgr;
 

diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h
index b4514dcfb420db452db1a4e24a3de6f9896e4b43..c1a0a57f950f87af3a3b0ae5bde419e4b8bbb0c4 100644 (file)
--- a/src/qemu/qemu_hostdev.h
+++ b/src/qemu/qemu_hostdev.h
@@ -27,15 +27,16 @@
 # include "qemu_conf.h"
 # include "domain_conf.h"
 
-int qemuUpdateActivePCIHostdevs(virQEMUDriverPtr driver,
-                                virDomainDefPtr def);
-int qemuUpdateActiveUSBHostdevs(virQEMUDriverPtr driver,
-                                virDomainDefPtr def);
-int qemuUpdateActiveSCSIHostdevs(virQEMUDriverPtr driver,
-                                 virDomainDefPtr def);
 bool qemuHostdevHostSupportsPassthroughLegacy(void);
 bool qemuHostdevHostSupportsPassthroughVFIO(void);
 
+int qemuHostdevUpdateActivePCIDevices(virQEMUDriverPtr driver,
+                                      virDomainDefPtr def);
+int qemuHostdevUpdateActiveUSBDevices(virQEMUDriverPtr driver,
+                                      virDomainDefPtr def);
+int qemuHostdevUpdateActiveSCSIDevices(virQEMUDriverPtr driver,
+                                       virDomainDefPtr def);
+
 int qemuHostdevPreparePCIDevices(virQEMUDriverPtr driver,
                                  const char *name,
                                  const unsigned char *uuid,

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 2608a1670aa2278c40fe48d12dbf246096402a7b..6f3214e48f888bcb4e12cef929633da02bfc12f4 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3769,13 +3769,13 @@ qemuProcessReconnect(void *opaque)
         priv->agentError = true;
     }
 
-    if (qemuUpdateActivePCIHostdevs(driver, obj->def) < 0)
+    if (qemuHostdevUpdateActivePCIDevices(driver, obj->def) < 0)
         goto error;
 
-    if (qemuUpdateActiveUSBHostdevs(driver, obj->def) < 0)
+    if (qemuHostdevUpdateActiveUSBDevices(driver, obj->def) < 0)
         goto error;
 
-    if (qemuUpdateActiveSCSIHostdevs(driver, obj->def) < 0)
+    if (qemuHostdevUpdateActiveSCSIDevices(driver, obj->def) < 0)
         goto error;
 
     if (qemuConnectCgroup(driver, obj) < 0)