mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-08-24 09:49:59 +03:00
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:
@ -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,
|
||||||
|
@ -348,9 +348,9 @@ error:
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int qemuDomainAttachPciControllerDevice(virQEMUDriverPtr driver,
|
int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver,
|
||||||
virDomainObjPtr vm,
|
virDomainObjPtr vm,
|
||||||
virDomainControllerDefPtr controller)
|
virDomainControllerDefPtr controller)
|
||||||
{
|
{
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
const char* type = virDomainControllerTypeToString(controller->type);
|
const char* type = virDomainControllerTypeToString(controller->type);
|
||||||
@ -438,8 +438,8 @@ 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,9 +3029,9 @@ static bool qemuDomainControllerIsBusy(virDomainObjPtr vm,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int qemuDomainDetachPciControllerDevice(virQEMUDriverPtr driver,
|
int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver,
|
||||||
virDomainObjPtr vm,
|
virDomainObjPtr vm,
|
||||||
virDomainDeviceDefPtr dev)
|
virDomainDeviceDefPtr dev)
|
||||||
{
|
{
|
||||||
int idx, ret = -1;
|
int idx, ret = -1;
|
||||||
virDomainControllerDefPtr detach = NULL;
|
virDomainControllerDefPtr detach = NULL;
|
||||||
|
@ -36,9 +36,9 @@ 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,
|
||||||
virQEMUDriverPtr driver,
|
virQEMUDriverPtr driver,
|
||||||
virDomainObjPtr vm,
|
virDomainObjPtr vm,
|
||||||
@ -78,9 +78,9 @@ 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,
|
||||||
virDomainObjPtr vm,
|
virDomainObjPtr vm,
|
||||||
virDomainDeviceDefPtr dev);
|
virDomainDeviceDefPtr dev);
|
||||||
|
Reference in New Issue
Block a user