From nobody Wed Feb 11 04:00:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673942940; cv=none; d=zohomail.com; s=zohoarc; b=JXPaCKerZPEQFOE3p8itdHwy1KEnstBypc2Nm/zX0sY2w7eZ7FhupIv8r1iQx05a+pOCEL0ErS3qYhMmE4pdTFTZVEnHt7axgoCQx4fWqS44DfqoIg0HYWKgUYCI4gyE7UONjivM+yHVzl8KWuP67v5oA9QeZVnXf2fNUyAQaJI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673942940; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=s2CxFTHityeNV5UFpIKrh+T9Z/RsPZNuWUHcYXPHaQg=; b=S30HdGE9o4JiwJ/qN9J78rlnef+RS+l8U5QTOryMWsNsbPD+X+qJWD1oIiGMHojh8ySFUVZxsupNJZd4jfu4S2yuZoVshKM9CHNa4WvZp+wObNP5/GHjGl1zZUpopWaqTraq7tLGotJUSMoVGTZ3pS2ipfEfA1y5gGYDiX7RWag= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673942940607583.6654056308314; Tue, 17 Jan 2023 00:09:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHh1H-0002tw-S0; Tue, 17 Jan 2023 03:08:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHh0g-0002nx-SQ for qemu-devel@nongnu.org; Tue, 17 Jan 2023 03:07:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHh0c-0000Rg-5u for qemu-devel@nongnu.org; Tue, 17 Jan 2023 03:07:58 -0500 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-267-QRgN9NKwMKCPDz_lja8Gwg-1; Tue, 17 Jan 2023 03:07:52 -0500 Received: by mail-ed1-f70.google.com with SMTP id m7-20020a056402510700b00488d1fcdaebso20458786edd.9 for ; Tue, 17 Jan 2023 00:07:51 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id x25-20020a170906b09900b0080345493023sm12606424ejy.167.2023.01.17.00.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 00:07:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673942873; 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=s2CxFTHityeNV5UFpIKrh+T9Z/RsPZNuWUHcYXPHaQg=; b=LJHMUwb51Gc4U4Im/zk31kheheRhJMqyVQJ7P0inyByAYBAVT9xCXoQQCXF5hegE/C2k6Q e+2MnRUDyrqem1BsE6VsSY3+YMghLJY4K/7CqGxplnqGJG8FcDJWfqLKgIDnXcJC3G7IMY 4aXbRB5PEWm8fYU08SIcKKZGduiwoEg= X-MC-Unique: QRgN9NKwMKCPDz_lja8Gwg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s2CxFTHityeNV5UFpIKrh+T9Z/RsPZNuWUHcYXPHaQg=; b=0cWRgVmN3zPxSsuyS96rcBdvRJOnGQAUO4w4foz4/Z7PtH/bsOvqnSd5Vpqlk+5bsp WQ3ciB4PY70utwAsxfnRLRRLjYTiJtL2dLy6Rf5RQxOyXYmSueAxzHfFXpYylZLF4N9z lZA+1grYnBuv1wgFiyHBtg4pdAr2XYjSCWuCgyGEMqABgAlsWAejyVbvKlcjqtfXf0QB birZ1HFgdPrjuzJR62zP/UVcYDk+yOGYb2dOcyWkBbNCgF5mmqhQXMdaKmCuGixAkVy+ PS8NNMQyKoyn2FyjpHHfHWXMaN/lOm2a8SbVkQ1GXZvLuaL5o+CkFMk4AJDgMTwCpKxd ntmg== X-Gm-Message-State: AFqh2kohMiHbaHb0IIATxcQkmb2X8gPVKhhI+6icSlGSsdZH1hNh8Z/B 3cpCUV3Ky98kkje7Cn3OP2Ag37RMS85Ay9+vF9X9ywVgxJllw5vUjCiINL3ofFCWofG22IY/tKf j0W4zDlSE6hBdtvURAV31DWPbA0sE198sH4aIstiDLx8FJvuDndmwljxfnbg7cI371Gw= X-Received: by 2002:a17:907:1747:b0:86e:7300:1fa8 with SMTP id lf7-20020a170907174700b0086e73001fa8mr2056968ejc.35.1673942870426; Tue, 17 Jan 2023 00:07:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXsYmlYMPt5PiigqaBkFJIRJY8WwSSKmYNoSq8q7fMmJJT4spbbMoZ9SvFr9t08eQVWHTpZQPw== X-Received: by 2002:a17:907:1747:b0:86e:7300:1fa8 with SMTP id lf7-20020a170907174700b0086e73001fa8mr2056953ejc.35.1673942870224; Tue, 17 Jan 2023 00:07:50 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: thuth@redhat.com Subject: [PATCH 1/4] vl: catch [accel] entry without accelerator Date: Tue, 17 Jan 2023 09:07:42 +0100 Message-Id: <20230117080745.43247-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230117080745.43247-1-pbonzini@redhat.com> References: <20230117080745.43247-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673942942282100001 Content-Type: text/plain; charset="utf-8" While QEMU catches invalid -accel command line options: $ qemu-system-x86_64 -accel foo=3Dbar Accelerators supported in QEMU binary: tcg xen kvm the same is not true of configuration files, which instead crash. Avoid a SIGSEGV and return an error instead. Reported-by: Thomas Huth Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1439 Signed-off-by: Paolo Bonzini --- softmmu/vl.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index 9bd0e52d016a..b6deaee52da4 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2204,14 +2204,18 @@ static int do_configure_accelerator(void *opaque, Q= emuOpts *opts, Error **errp) int ret; bool qtest_with_kvm; =20 + if (!acc) { + error_setg(&error_fatal, QERR_MISSING_PARAMETER, "accel"); + goto bad; + } + qtest_with_kvm =3D g_str_equal(acc, "kvm") && qtest_chrdev !=3D NULL; =20 if (!ac) { - *p_init_failed =3D true; if (!qtest_with_kvm) { error_report("invalid accelerator %s", acc); } - return 0; + goto bad; } accel =3D ACCEL(object_new_with_class(OBJECT_CLASS(ac))); object_apply_compat_props(OBJECT(accel)); @@ -2221,14 +2225,17 @@ static int do_configure_accelerator(void *opaque, Q= emuOpts *opts, Error **errp) =20 ret =3D accel_init_machine(accel, current_machine); if (ret < 0) { - *p_init_failed =3D true; if (!qtest_with_kvm || ret !=3D -ENOENT) { error_report("failed to initialize %s: %s", acc, strerror(-ret= )); } - return 0; + goto bad; } =20 return 1; + +bad: + *p_init_failed =3D true; + return 0; } =20 static void configure_accelerators(const char *progname) --=20 2.38.1