From nobody Tue May 7 17:36:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1535112224903115.74579714995696; Fri, 24 Aug 2018 05:03:44 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AAD2986674; Fri, 24 Aug 2018 12:03:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 53EBB8C068; Fri, 24 Aug 2018 12:03:42 +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 0E3E2181A12D; Fri, 24 Aug 2018 12:03:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7OC3eaK010464 for ; Fri, 24 Aug 2018 08:03:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6946210877C; Fri, 24 Aug 2018 12:03:40 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DB3A6108761; Fri, 24 Aug 2018 12:03:37 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 24 Aug 2018 14:03:22 +0200 Message-Id: <20180824120322.21707-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: lkundrak@v3.sk Subject: [libvirt] [PATCH] qemu: Don't use legacy USB for RISC-V guests 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 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 24 Aug 2018 12:03:43 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The architecture is new enough that we don't need to concern ourselves with backwards compatibility in any capacity. Signed-off-by: Andrea Bolognani Reviewed-by: J=EF=BF=BDn Tomko --- Requires https://www.redhat.com/archives/libvir-list/2018-June/msg01223.html to be applied (and test data to be refreshed in the process). src/qemu/qemu_command.c | 4 +++- tests/qemuxml2argvdata/riscv64-virt.args | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 88d698e262..bac7c938ab 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3046,7 +3046,8 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd, if (cont->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB && cont->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT= && !qemuDomainIsQ35(def) && - !qemuDomainIsARMVirt(def)) { + !qemuDomainIsARMVirt(def) && + !qemuDomainIsRISCVVirt(def)) { =20 /* An appropriate default USB controller model should alre= ady * have been selected in qemuDomainDeviceDefPostParse(); if @@ -3085,6 +3086,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd, if (usbcontroller =3D=3D 0 && !qemuDomainIsQ35(def) && !qemuDomainIsARMVirt(def) && + !qemuDomainIsRISCVVirt(def) && !ARCH_IS_S390(def->os.arch)) { /* We haven't added any USB controller yet, but we haven't been as= ked * not to add one either. Add a legacy USB controller, unless we're diff --git a/tests/qemuxml2argvdata/riscv64-virt.args b/tests/qemuxml2argvd= ata/riscv64-virt.args index 0e103a6755..a373ff2b92 100644 --- a/tests/qemuxml2argvdata/riscv64-virt.args +++ b/tests/qemuxml2argvdata/riscv64-virt.args @@ -21,7 +21,6 @@ server,nowait \ -no-shutdown \ -kernel /var/lib/libvirt/images/bbl \ -append 'console=3DttyS0 ro root=3D/dev/vda' \ --usb \ -drive file=3D/var/lib/libvirt/images/stage4-disk.img,format=3Draw,if=3Dno= ne,\ id=3Ddrive-virtio-disk0 \ -device virtio-blk-device,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,boo= tindex=3D1 \ --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list