From: Eric Farman <farman@linux.vnet.ibm.com>
Date: Thu, 21 Nov 2013 03:36:25 +0000 (-0500)
Subject: qemu: Rename controller hotplug functions to not be PCI-specific
X-Git-Tag: v1.2.0-rc1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=271eb0584b789c550187e85bdc9fa09f44a37352;p=thirdparty%2Flibvirt.git

qemu: Rename controller hotplug functions to not be PCI-specific

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@linux.vnet.ibm.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 795e72a2e7..8a1eefdd39 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6328,7 +6328,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,
@@ -6420,7 +6420,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 0d9a3aa460..c81d0f369f 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;
     }
@@ -3029,9 +3029,9 @@ static bool qemuDomainControllerIsBusy(virDomainObjPtr vm,
     }
 }
 
-int qemuDomainDetachPciControllerDevice(virQEMUDriverPtr driver,
-                                        virDomainObjPtr vm,
-                                        virDomainDeviceDefPtr dev)
+int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver,
+                                     virDomainObjPtr vm,
+                                     virDomainDeviceDefPtr dev)
 {
     int idx, ret = -1;
     virDomainControllerDefPtr detach = NULL;
diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
index 355d809c26..75789d6297 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);