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(a)linux.vnet.ibm.com>
---
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 346a8f9..4239fba 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6299,7 +6299,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,
@@ -6391,7 +6391,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 6cdee44..cb62101 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;
}
@@ -2989,7 +2989,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