[PATCH 1/3] qemu: Rename controller hotplug functions to not be PCI-specific

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



For attach/detach of controller devices, we rename the functions to
remove 'PCI' from their title.  The actual separation of PCI-specific
operations will be handled in the next patch.

Signed-off-by: Eric Farman <farman@xxxxxxxxxxxxxxxxxx>
---
 src/qemu/qemu_driver.c  |    4 ++--
 src/qemu/qemu_hotplug.c |   12 ++++++------
 src/qemu/qemu_hotplug.h |   12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c71aecc..60bcd1a 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6300,7 +6300,7 @@ qemuDomainAttachDeviceControllerLive(virQEMUDriverPtr driver,
 
     switch (cont->type) {
     case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
-        ret = qemuDomainAttachPciControllerDevice(driver, vm, cont);
+        ret = qemuDomainAttachControllerDevice(driver, vm, cont);
         break;
     default:
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
@@ -6392,7 +6392,7 @@ qemuDomainDetachDeviceControllerLive(virQEMUDriverPtr driver,
 
     switch (cont->type) {
     case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
-        ret = qemuDomainDetachPciControllerDevice(driver, vm, dev);
+        ret = qemuDomainDetachControllerDevice(driver, vm, dev);
         break;
     default :
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 818c726..bc0f57a 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -348,9 +348,9 @@ error:
 }
 
 
-int qemuDomainAttachPciControllerDevice(virQEMUDriverPtr driver,
-                                        virDomainObjPtr vm,
-                                        virDomainControllerDefPtr controller)
+int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver,
+                                     virDomainObjPtr vm,
+                                     virDomainControllerDefPtr controller)
 {
     int ret = -1;
     const char* type = virDomainControllerTypeToString(controller->type);
@@ -438,8 +438,8 @@ qemuDomainFindOrCreateSCSIDiskController(virQEMUDriverPtr driver,
     cont->model = -1;
 
     VIR_INFO("No SCSI controller present, hotplugging one");
-    if (qemuDomainAttachPciControllerDevice(driver,
-                                            vm, cont) < 0) {
+    if (qemuDomainAttachControllerDevice(driver,
+                                         vm, cont) < 0) {
         VIR_FREE(cont);
         return NULL;
     }
@@ -3004,7 +3004,7 @@ static bool qemuDomainControllerIsBusy(virDomainObjPtr vm,
     }
 }
 
-int qemuDomainDetachPciControllerDevice(virQEMUDriverPtr driver,
+int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver,
                                         virDomainObjPtr vm,
                                         virDomainDeviceDefPtr dev)
 {
diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
index 355d809..75789d6 100644
--- a/src/qemu/qemu_hotplug.h
+++ b/src/qemu/qemu_hotplug.h
@@ -36,9 +36,9 @@ int qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
 int qemuDomainCheckEjectableMedia(virQEMUDriverPtr driver,
                                   virDomainObjPtr vm,
                                   enum qemuDomainAsyncJob asyncJob);
-int qemuDomainAttachPciControllerDevice(virQEMUDriverPtr driver,
-                                        virDomainObjPtr vm,
-                                        virDomainControllerDefPtr controller);
+int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver,
+                                     virDomainObjPtr vm,
+                                     virDomainControllerDefPtr controller);
 int qemuDomainAttachDeviceDiskLive(virConnectPtr conn,
                                    virQEMUDriverPtr driver,
                                    virDomainObjPtr vm,
@@ -78,9 +78,9 @@ int qemuDomainChangeNetLinkState(virQEMUDriverPtr driver,
 int qemuDomainDetachDeviceDiskLive(virQEMUDriverPtr driver,
                                    virDomainObjPtr vm,
                                    virDomainDeviceDefPtr dev);
-int qemuDomainDetachPciControllerDevice(virQEMUDriverPtr driver,
-                                        virDomainObjPtr vm,
-                                        virDomainDeviceDefPtr dev);
+int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver,
+                                     virDomainObjPtr vm,
+                                     virDomainDeviceDefPtr dev);
 int qemuDomainDetachNetDevice(virQEMUDriverPtr driver,
                               virDomainObjPtr vm,
                               virDomainDeviceDefPtr dev);
-- 
1.7.9.5

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]