From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31822C433DB for ; Mon, 22 Feb 2021 17:48:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C62F964F04 for ; Mon, 22 Feb 2021 17:48:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231725AbhBVRsN (ORCPT ); Mon, 22 Feb 2021 12:48:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50833 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231176AbhBVRsL (ORCPT ); Mon, 22 Feb 2021 12:48:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614016005; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=ap6wVunjnHQO5CinJJgI7vpNWx2oOiKw2tFNPevDbBQ=; b=IiXs8i2x6myKv868OO8gwF3+SXzxb3AuBV6dmfVtf/6jofn8uQVLwZ8V7s0rIJjAIbb+R3 OjoRu0/k/LBAP6VhtnH0sJW35XYydGMrO1ttkbt/MNSdAdsgO80ovuGyDzCkevTxg7LoZh RQmTBBCTGjhnU+HBQUsiUx3udFkiL6U= 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-126-MITzUUf3Oqye6SI3VLeV4w-1; Mon, 22 Feb 2021 12:46:41 -0500 X-MC-Unique: MITzUUf3Oqye6SI3VLeV4w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BFE62C291; Mon, 22 Feb 2021 17:46:37 +0000 (UTC) Received: from gondolin (ovpn-113-115.ams2.redhat.com [10.36.113.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CA0B5D6B1; Mon, 22 Feb 2021 17:46:23 +0000 (UTC) Date: Mon, 22 Feb 2021 18:46:20 +0100 From: Cornelia Huck To: Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Cc: qemu-devel@nongnu.org, Aurelien Jarno , Peter Maydell , Anthony Perard , qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, Halil Pasic , Huacai Chen , xen-devel@lists.xenproject.org, Marcel Apfelbaum , David Gibson , qemu-arm@nongnu.org, Stefano Stabellini , Paolo Bonzini , kvm@vger.kernel.org, BALATON Zoltan , Leif Lindholm , Richard Henderson , Radoslaw Biernacki , Alistair Francis , Paul Durrant , Eduardo Habkost , "Michael S. Tsirkin" , Thomas Huth , Jiaxun Yang , =?UTF-8?B?SGVydsOp?= Poussineau , Greg Kurz , Christian Borntraeger , "Edgar E. Iglesias" , David Hildenbrand , Mark Cave-Ayland , Aleksandar Rikalo , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Subject: Re: [PATCH v2 11/11] softmmu/vl: Exit gracefully when accelerator is not supported Message-ID: <20210222184620.57119057.cohuck@redhat.com> In-Reply-To: <20210219173847.2054123-12-philmd@redhat.com> References: <20210219173847.2054123-1-philmd@redhat.com> <20210219173847.2054123-12-philmd@redhat.com> Organization: Red Hat GmbH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Fri, 19 Feb 2021 18:38:47 +0100 Philippe Mathieu-Daud=C3=A9 wrote: > Before configuring an accelerator, check it is valid for > the current machine. Doing so we can return a simple error > message instead of criptic one. s/criptic/cryptic/ >=20 > Before: >=20 > $ qemu-system-arm -M raspi2b -enable-kvm > qemu-system-arm: /build/qemu-ETIdrs/qemu-4.2/exec.c:865: cpu_address_sp= ace_init: Assertion `asidx =3D=3D 0 || !kvm_enabled()' failed. > Aborted >=20 > $ qemu-system-aarch64 -M xlnx-zcu102 -enable-kvm -smp 6 > qemu-system-aarch64: kvm_init_vcpu: kvm_arch_init_vcpu failed (0): Inva= lid argument >=20 > After: >=20 > $ qemu-system-arm -M raspi2b -enable-kvm > qemu-system-aarch64: invalid accelerator 'kvm' for machine raspi2b >=20 > $ qemu-system-aarch64 -M xlnx-zcu102 -enable-kvm -smp 6 > qemu-system-aarch64: -accel kvm: invalid accelerator 'kvm' for machine = xlnx-zcu102 >=20 > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > --- > softmmu/vl.c | 7 +++++++ > 1 file changed, 7 insertions(+) >=20 > diff --git a/softmmu/vl.c b/softmmu/vl.c > index b219ce1f357..f2c4074310b 100644 > --- a/softmmu/vl.c > +++ b/softmmu/vl.c > @@ -2133,6 +2133,7 @@ static int do_configure_accelerator(void *opaque, Q= emuOpts *opts, Error **errp) > const char *acc =3D qemu_opt_get(opts, "accel"); > AccelClass *ac =3D accel_find(acc); > AccelState *accel; > + MachineClass *mc; > int ret; > bool qtest_with_kvm; > =20 > @@ -2145,6 +2146,12 @@ static int do_configure_accelerator(void *opaque, = QemuOpts *opts, Error **errp) > } > return 0; > } > + mc =3D MACHINE_GET_CLASS(current_machine); > + if (!qtest_chrdev && !machine_class_valid_for_accelerator(mc, ac->na= me)) { Shouldn't qtest be already allowed in any case in the checking function? > + *p_init_failed =3D true; > + error_report("invalid accelerator '%s' for machine %s", acc, mc-= >name); > + return 0; > + } > accel =3D ACCEL(object_new_with_class(OBJECT_CLASS(ac))); > object_apply_compat_props(OBJECT(accel)); > qemu_opt_foreach(opts, accelerator_set_property,