On Wed, Jan 24, 2024 at 20:37:32 +0100, Andrea Bolognani wrote:
It only has a single caller.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/qemu/qemu_alias.c | 13 +++++++++++-- src/qemu/qemu_domain_address.c | 26 -------------------------- src/qemu/qemu_domain_address.h | 3 --- 3 files changed, 11 insertions(+), 31 deletions(-)
diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 686b5a4d80..d2c28c182b 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -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);
Broken alignment. With that fixed: Reviewed-by: Peter Krempa <pkrempa@redhat.com>