External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Drop qemuDomainFindSCSIControllerModel()

Browse Source 
It only has a single caller.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Andrea Bolognani 2024-01-19 15:46:06 +01:00
parent d0087e65d8
commit 7d6ec89243
3 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/qemu/qemu_alias.c
View File

@ -214,8 +214,17 @@ qemuAssignDeviceDiskAlias(virDomainDef *def,
if (!disk->info.alias) {
if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) {
if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) {
controllerModel = qemuDomainFindSCSIControllerModel(def,
&disk->info);
virDomainControllerDef *cont;
if (!(cont = virDomainDeviceFindSCSIController(def, &disk->info.addr.drive))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unable to find a SCSI controller for idx=%1$d"),
disk->info.addr.drive.controller);
return -1;
}
controllerModel = cont->model;
if (controllerModel < 0)
return -1;
}

26
src/qemu/qemu_domain_address.c
View File

@ -99,32 +99,6 @@ qemuDomainSetSCSIControllerModel(const virDomainDef *def,
}
/**
* @def: Domain definition
* @info: Domain device info
*
* Using the device info, find the controller related to the
* device by index and use that controller to return the model.
*
* Returns the model if found, -1 if not with an error message set
*/
int
qemuDomainFindSCSIControllerModel(const virDomainDef *def,
virDomainDeviceInfo *info)
{
virDomainControllerDef *cont;
if (!(cont = virDomainDeviceFindSCSIController(def, &info->addr.drive))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unable to find a SCSI controller for idx=%1$d"),
info->addr.drive.controller);
return -1;
}
return cont->model;
}
static int
qemuDomainAssignVirtioSerialAddresses(virDomainDef *def)
{

3
src/qemu/qemu_domain_address.h
View File

@ -32,9 +32,6 @@ int qemuDomainSetSCSIControllerModel(const virDomainDef *def,
virDomainControllerDef *cont,
virQEMUCaps *qemuCaps);
int qemuDomainFindSCSIControllerModel(const virDomainDef *def,
virDomainDeviceInfo *info);
int qemuDomainAssignAddresses(virDomainDef *def,
virQEMUCaps *qemuCaps,
virQEMUDriver *driver,