From nobody Thu Apr 25 05:09:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578904237; cv=none; d=zohomail.com; s=zohoarc; b=k6reTMW2K6UPK03irwwoIk2oIZVLN9TsonF63R0CDqBn5h0QWQ9EorCy3/ISKGIanZGT6UIVObSVm2SqAR4sto0oXLpFTisIO1bWW5I/7mE2U3damJIYu4QbkJh4YLtqxbMpzW7i9+nLYTbTK8GuQA8mkKuSluqIbwTQ69HJsv4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578904237; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=XwwMtceMzpIBy/EGKEufOB6BtonicXkrbMG/ps9EvG4=; b=LsfUPYWREVkJkOnwgltYTS8+rLzjRXaZlGawCOiPNFnoaKuAABiZv4s9HerI9FskwTQ2pQ6SS7aIZd10pWmXB1Ni+yhx3hdQzWUQt1qkNqbMpBRBqaVn+WNsgDn2ZlJBmPVfZRMlbNUme/eZTu0ae/bx8u024bxQHrnduupiDr8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 157890423704667.39830472693689; Mon, 13 Jan 2020 00:30:37 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-387-L6YeXtHlMGOy6GMM2NKqWg-1; Mon, 13 Jan 2020 03:30:34 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3169210054E3; Mon, 13 Jan 2020 08:30:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 981555DA32; Mon, 13 Jan 2020 08:30:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B057F82501; Mon, 13 Jan 2020 08:30:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00D8ULNf029133 for ; Mon, 13 Jan 2020 03:30:21 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9A77380F57; Mon, 13 Jan 2020 08:30:21 +0000 (UTC) Received: from thuth.com (ovpn-116-87.ams2.redhat.com [10.36.116.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C03F80F43; Mon, 13 Jan 2020 08:30:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578904235; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=XwwMtceMzpIBy/EGKEufOB6BtonicXkrbMG/ps9EvG4=; b=gUAGYbbby8hn/LEsqfE/d3jojZdKaLD/qtF2C0KDPTts6XgKN4T63B/asyCo3z7JFYu2eI eDKG6uHIfGdHbvjuTKxrKix3iFHdg9zmQVMP7PYpda3Gz93cnrHKAVPy3wDfVnq4NnNwjf +BoyD/77+qihHf0ki6wOQkmwALb/fqQ= From: Thomas Huth To: libvir-list@redhat.com Date: Mon, 13 Jan 2020 09:30:14 +0100 Message-Id: <20200113083014.14348-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Bjoern Walk , Stefan Zimmermann , Boris Fiuczynski , Marc Hartmayer Subject: [libvirt] [PATCH] domain_conf: Do not use USB by default for devices on s390x X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: L6YeXtHlMGOy6GMM2NKqWg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" When trying to specify an input device on s390x without bus like this: ... 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=3D1790189 Signed-off-by: Thomas Huth Reviewed-by: Michal Privoznik --- 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 xml= opt, def->type =3D=3D VIR_DOMAIN_INPUT_TYPE_KBD) && (ARCH_IS_X86(dom->os.arch) || dom->os.arch =3D=3D VIR_ARCH= _NONE)) { def->bus =3D VIR_DOMAIN_INPUT_BUS_PS2; + } else if (ARCH_IS_S390(dom->os.arch)) { + def->bus =3D VIR_DOMAIN_INPUT_BUS_VIRTIO; } else { def->bus =3D VIR_DOMAIN_INPUT_BUS_USB; } --=20 2.18.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list