From nobody Thu Nov 6 08:34:28 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 1497524382828985.3674904539289; Thu, 15 Jun 2017 03:59:42 -0700 (PDT) Received: from localhost ([::1]:53149 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLSV3-0005gM-CA for importer@patchew.org; Thu, 15 Jun 2017 06:59:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40884) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLSP5-0008Ff-Iz for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLSP2-0007ZC-P7 for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:31 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:34358) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLSP2-0007Yt-IT for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:28 -0400 Received: by mail-wr0-x242.google.com with SMTP id y25so545985wrd.1 for ; Thu, 15 Jun 2017 03:53:28 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id f21sm3258597wra.5.2017.06.15.03.53.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 03:53:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=zVqajfGmZR+0F2ApVXmf+43pmswXRm/EHANXV8d7clw=; b=upY3NwKpj0zy//PWxdS+TBzLiLAbM3xeZbGTdsE1nFEk4AB0O8yHVJ339+Kp2onk6N /uoxcQ1iQ8rmKom/edtYnKKSJG5InRjCvfmNNyAbOQRGeX7JnhwhgFCwxNov/GQA6pcL HR/pbDir8X0YZI06nx8EbXz24z2S9ow9kanWHqKXA6RQUHGHLehgWpQRZh70Df6tsZFn X72GJ8urEGb3cCAj5AnEa4yQlaJevNeCpRR2hJkTb0jap9ZyyRxkfaxSYofXZFkaa17A 5f9y68lKh/f01V++oksncLa/GCDFHBcSzNOmEmrU4fGw4ZyPSdhPuHQk9bS2xn7XBwVe 8zJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=zVqajfGmZR+0F2ApVXmf+43pmswXRm/EHANXV8d7clw=; b=Lxo2LkDEnvQNBqKuRH+fyS6bbNVhQROK5cAHu4dZvzF8NHdue7tCc2W0OStVMHxYfe jHqpufjeLo4nsnTd5lilGGHj0figu9mSVNKpn8ggjqm0T7DbT62F8olsC7qzA/xQTluV T0EDoM0kKexU0ErJzB2gstCMcnLFhDrJP0omJZGK4n/Td6M9pVmbxZqkjkQ39qI9c1wr Sdhh5tlfAxyUM+okahQpSFOBWBRfzInStfSvozKTIBki5CwlzuhoCnDy28+4FSAWRgXR eBmaDUKoOnKl18MzqKCdkZo5X2RBzZueRnkuFNatRG6MgvLT6Ep2ezjwEI+q/n5Wx6Xt 4+QA== X-Gm-Message-State: AKS2vOw7lEUDJ8/4os8tS5/Ff6ginxRSzvBBJfcf+3azSwejWPYt+2Q8 QqGC8Tn7bS3nns1U4cc= X-Received: by 10.28.55.201 with SMTP id e192mr2958137wma.75.1497524007353; Thu, 15 Jun 2017 03:53:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 15 Jun 2017 12:52:35 +0200 Message-Id: <1497523981-38449-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1497523981-38449-1-git-send-email-pbonzini@redhat.com> References: <1497523981-38449-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PULL 15/41] 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 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 Message-Id: <1496899257-25800-1-git-send-email-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- vl.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/vl.c b/vl.c index 32db19e..59fea15 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 1.8.3.1