openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Eric Farman 2013-11-20 22:36:25 -05:00 committed by Ján Tomko
parent b96651dec0
commit 271eb0584b
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_driver.c
View File

@ -6328,7 +6328,7 @@ qemuDomainAttachDeviceControllerLive(virQEMUDriverPtr driver,
switch (cont->type) { switch (cont->type) {
case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
ret = qemuDomainAttachPciControllerDevice(driver, vm, cont); ret = qemuDomainAttachControllerDevice(driver, vm, cont);
break; break;
default: default:
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
@ -6420,7 +6420,7 @@ qemuDomainDetachDeviceControllerLive(virQEMUDriverPtr driver,
switch (cont->type) { switch (cont->type) {
case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
ret = qemuDomainDetachPciControllerDevice(driver, vm, dev); ret = qemuDomainDetachControllerDevice(driver, vm, dev);
break; break;
default : default :
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, virReportError(VIR_ERR_OPERATION_UNSUPPORTED,

6
src/qemu/qemu_hotplug.c
View File

@ -348,7 +348,7 @@ error:
} }
int qemuDomainAttachPciControllerDevice(virQEMUDriverPtr driver, int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainControllerDefPtr controller) virDomainControllerDefPtr controller)
{ {
@ -438,7 +438,7 @@ qemuDomainFindOrCreateSCSIDiskController(virQEMUDriverPtr driver,
cont->model = -1; cont->model = -1;
VIR_INFO("No SCSI controller present, hotplugging one"); VIR_INFO("No SCSI controller present, hotplugging one");
if (qemuDomainAttachPciControllerDevice(driver, if (qemuDomainAttachControllerDevice(driver,
vm, cont) < 0) { vm, cont) < 0) {
VIR_FREE(cont); VIR_FREE(cont);
return NULL; return NULL;
@ -3029,7 +3029,7 @@ static bool qemuDomainControllerIsBusy(virDomainObjPtr vm,
} }
} }
int qemuDomainDetachPciControllerDevice(virQEMUDriverPtr driver, int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainDeviceDefPtr dev) virDomainDeviceDefPtr dev)
{ {

4
src/qemu/qemu_hotplug.h
View File

@ -36,7 +36,7 @@ int qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
int qemuDomainCheckEjectableMedia(virQEMUDriverPtr driver, int qemuDomainCheckEjectableMedia(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
enum qemuDomainAsyncJob asyncJob); enum qemuDomainAsyncJob asyncJob);
int qemuDomainAttachPciControllerDevice(virQEMUDriverPtr driver, int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainControllerDefPtr controller); virDomainControllerDefPtr controller);
int qemuDomainAttachDeviceDiskLive(virConnectPtr conn, int qemuDomainAttachDeviceDiskLive(virConnectPtr conn,
@ -78,7 +78,7 @@ int qemuDomainChangeNetLinkState(virQEMUDriverPtr driver,
int qemuDomainDetachDeviceDiskLive(virQEMUDriverPtr driver, int qemuDomainDetachDeviceDiskLive(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainDeviceDefPtr dev); virDomainDeviceDefPtr dev);
int qemuDomainDetachPciControllerDevice(virQEMUDriverPtr driver, int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainDeviceDefPtr dev); virDomainDeviceDefPtr dev);
int qemuDomainDetachNetDevice(virQEMUDriverPtr driver, int qemuDomainDetachNetDevice(virQEMUDriverPtr driver,