[libvirt] [PATCH v5 05/16] qemu: Adjust SCSI controller switch in qemuBuildControllerDevStr

[Michal Privoznik]

On 01/06/2018 12:47 AM, John Ferlan wrote:
> Modify the SCSI controller switch during command line building
> to account for all virDomainControllerModelSCSI types rather
> than using the default label.
> 
> Signed-off-by: John Ferlan <jferlan at redhat.com>
> ---
>  src/qemu/qemu_command.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index b955fb66e..515206261 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -2667,7 +2667,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef,
>          if ((qemuDomainResetSCSIControllerModel(domainDef, qemuCaps, &model)) < 0)
>              return -1;
>  
> -        switch (model) {
> +        switch ((virDomainControllerModelSCSI) model) {
>          case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI:
>              if (def->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) {
>                  virBufferAddLit(&buf, "virtio-scsi-ccw");
> @@ -2707,7 +2707,10 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef,
>          case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078:
>              virBufferAddLit(&buf, "megasas");
>              break;
> -        default:
> +        case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO:
> +        case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_BUSLOGIC:
> +        case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI:
> +        case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST:
>              virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
>                             _("Unsupported controller model: %s"),
>                             virDomainControllerModelSCSITypeToString(def->model));
> 

ACK

Michal