From nobody Wed Nov 5 15:38:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149702776812781.62452525622643; Fri, 9 Jun 2017 10:02:48 -0700 (PDT) Received: from localhost ([::1]:55823 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJNJ7-0006fK-Ob for importer@patchew.org; Fri, 09 Jun 2017 13:02:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJNHD-000570-Q1 for qemu-devel@nongnu.org; Fri, 09 Jun 2017 13:00:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJNHC-0004iV-Fa for qemu-devel@nongnu.org; Fri, 09 Jun 2017 13:00:47 -0400 Received: from mail-wr0-x233.google.com ([2a00:1450:400c:c0c::233]:36794) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dJNHC-0004iG-96 for qemu-devel@nongnu.org; Fri, 09 Jun 2017 13:00:46 -0400 Received: by mail-wr0-x233.google.com with SMTP id v111so39520903wrc.3 for ; Fri, 09 Jun 2017 10:00:46 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p65sm2362058wrb.64.2017.06.09.10.00.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Jun 2017 10:00:42 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 96C933E0270; Fri, 9 Jun 2017 18:01:11 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gydgg+H8Ay+NJOfdtoqDtfexA3T4DwO5t6WuipOjLOo=; b=NsT5Kut2olF+UwOF1LZ+PZVc3K90qpSx/4sVdBA2V20Zj8ntFs3qKf/Dg0vcscxx33 yjOeMIJTmo9kskHJ+aJF/JZjRiAzQfq+p0FCF72eU9+3yqL+MFqp4LPJojYD+ztDqkqG E9iSWb4BFWVhfzvkrXieyCBc+bYkKfl4mSKmk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gydgg+H8Ay+NJOfdtoqDtfexA3T4DwO5t6WuipOjLOo=; b=lYCNyZIr2aOJt1ZlgrkwQCc/OQ8r9SndZpgL7kRcj4SDAbVOgDL6NnidQc+xPgl46L llRFRP5TQscQWoDWslkI8nJRfjtHN1F3SDzRPl+EI1nG8WFxwd7B/q5KHumxhv2zGd96 vi5m+adW5CegGE46wkgPXmjfdZs2Q1irzda84Y+v2LiN/JhdMIfljKk+v+Xnz1+5bCIT TNgxYfaojDaZAD8d5KChVMEVpi4iUsYD5Gpeb2jwWDCNYGx6rxWpuUX15qgTWD71SU+K y2bxP6nMpwtDqNbe3IPkWLs0brlalD+RtQxKvS1cOwWitl/QH80pXZ7TGm1cc4u0qEtY /UvA== X-Gm-Message-State: AKS2vOxxdHHnARfr5nDWSgOKW7QRCJqrZTLJcXk0an/1SOx1ITU5rEcb S9s3Lvw1+zRZHY/D X-Received: by 10.28.147.71 with SMTP id v68mr503759wmd.69.1497027644504; Fri, 09 Jun 2017 10:00:44 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, pbonzini@redhat.com, edgar.iglesias@xilinx.com, cota@braap.org Date: Fri, 9 Jun 2017 18:00:58 +0100 Message-Id: <20170609170100.3599-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170609170100.3599-1-alex.bennee@linaro.org> References: <20170609170100.3599-1-alex.bennee@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::233 Subject: [Qemu-devel] [RFC DEBUG PATCH 1/3] vl: Fix broken thread=xxx option of the --accel parameter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth Commit bde4d9205 ("Fix the -accel parameter and the documentation for 'hax'") introduced a regression by adding a new local accel_opts variable which shadows the variable with the same name that is declared at the beginning of the main() scope. This causes the qemu_tcg_configure() call later to be always called with NULL, so that the thread=3Dxxx option gets ignored. Fix it by removing the local accel_opts variable and use "opts" instead, which is meant for storing temporary QemuOpts values. And while we're at it, also change the exit(1) here to exit(0) since asking for help is not an error. Fixes: bde4d9205ee9def98852ff6054cdef4efd74e1f8 Reported-by: Markus Armbruster Reported-by: Emilio G. Cota Signed-off-by: Thomas Huth --- vl.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/vl.c b/vl.c index be4dcf25ba..5aba544f67 100644 --- a/vl.c +++ b/vl.c @@ -3757,21 +3757,18 @@ int main(int argc, char **argv, char **envp) qdev_prop_register_global(&kvm_pit_lost_tick_policy); break; } - case QEMU_OPTION_accel: { - QemuOpts *accel_opts; - + case QEMU_OPTION_accel: accel_opts =3D qemu_opts_parse_noisily(qemu_find_opts("acc= el"), optarg, true); optarg =3D qemu_opt_get(accel_opts, "accel"); if (!optarg || is_help_option(optarg)) { error_printf("Possible accelerators: kvm, xen, hax, tc= g\n"); - exit(1); + exit(0); } - accel_opts =3D qemu_opts_create(qemu_find_opts("machine"),= NULL, - false, &error_abort); - qemu_opt_set(accel_opts, "accel", optarg, &error_abort); + opts =3D qemu_opts_create(qemu_find_opts("machine"), NULL, + false, &error_abort); + qemu_opt_set(opts, "accel", optarg, &error_abort); break; - } case QEMU_OPTION_usb: olist =3D qemu_find_opts("machine"); qemu_opts_parse_noisily(olist, "usb=3Don", false); --=20 2.13.0