[libvirt] [PATCH] domain_conf: Do not use USB by default for <input> devices on s390x

[Michal Privoznik]

On 1/13/20 9:30 AM, Thomas Huth wrote:
> When trying to specify an input device on s390x without bus like this:
> 
>   <input type='keyboard'/>
> 
> ... then libvirt currently complains:
> 
>   error: unsupported configuration: USB is disabled for this domain,
>   but USB devices are present in the domain XML
> 
> This is somewhat confusing since the user did not specify an USB
> device here. Since USB is not available on s390x, we should default
> to the "virtio" bus here instead.
> 
> Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1790189
> Signed-off-by: Thomas Huth <thuth at redhat.com>
> ---
>   src/conf/domain_conf.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 1290241923..c3761b0f45 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -13428,6 +13428,8 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xmlopt,
>                   def->type == VIR_DOMAIN_INPUT_TYPE_KBD) &&
>                   (ARCH_IS_X86(dom->os.arch) || dom->os.arch == VIR_ARCH_NONE)) {
>                   def->bus = VIR_DOMAIN_INPUT_BUS_PS2;
> +            } else if (ARCH_IS_S390(dom->os.arch)) {
> +                def->bus = VIR_DOMAIN_INPUT_BUS_VIRTIO;
>               } else {
>                   def->bus = VIR_DOMAIN_INPUT_BUS_USB;
>               }
> 

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

and pushed.

Michal