From patchwork Wed Jun 14 14:02:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 775800 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wnpHH6R5Sz9s76 for ; Thu, 15 Jun 2017 00:02:35 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="bMMJUspw"; dkim-atps=neutral Received: from localhost ([::1]:49219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dL8sT-0005zZ-K9 for incoming@patchwork.ozlabs.org; Wed, 14 Jun 2017 10:02:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40192) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dL8rg-0005rz-LU for qemu-devel@nongnu.org; Wed, 14 Jun 2017 10:01:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dL8ra-0008Fi-KY for qemu-devel@nongnu.org; Wed, 14 Jun 2017 10:01:44 -0400 Received: from mail-wr0-x22d.google.com ([2a00:1450:400c:c0c::22d]:35522) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dL8ra-0008FK-El for qemu-devel@nongnu.org; Wed, 14 Jun 2017 10:01:38 -0400 Received: by mail-wr0-x22d.google.com with SMTP id q97so1982885wrb.2 for ; Wed, 14 Jun 2017 07:01:38 -0700 (PDT) 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=FYYIxxb8R+gdvtytxuptlbGOMv/RvOnBk2cYDfwDbPI=; b=bMMJUspw6Ck6U6LvmnzSdZJdDC4Xx0IWW7PIOJeFU2WFUOIz1VbwIS9MUtISPgEAZ+ v7optRyyrHPBYfOmXAKtAa7pIWEg70ngOQxhl5B4WCvuvb4RWjwt/mUU5cAtyba9+sSx npu1tV+YFhFc2CCvfLwwoxvohM6KT6jSe1QG4= 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=FYYIxxb8R+gdvtytxuptlbGOMv/RvOnBk2cYDfwDbPI=; b=tWxsBrWHo7zSeEDxGwdYStHJNbL2wdG2ozY80PI5+horrhPG99efmoMeOLzXe1f2YG uvUEJMocZIAFN2aeT6qEKCJ+b+d41hKusofvwdvIlilePfymGGPuPgL9a5XI1FzKJBoT s/cFbNKM0JygyQP1KXZzSrw+SdyakVqmIl70UWESuAD0MWtJqU/feAUbbh828QQuE5bg 6gpTxXHr3j99/3dvta+0I0cnub/519zw9BySY1agmzG8LICS7jo8w1uptbeN/4V5yAJm d4XOSNB/boZhI8920lRUMwkhDQBWlRX0oSZJaKkizuMyUheZdZlHOTr7ZYiNTJZaLnj+ z2aA== X-Gm-Message-State: AKS2vOxQVqRvXNO9zMJYg1+4X2FUT6/isoOUCtD7hkgNxVdbNPhU5Gu/ VOLdLHAdpZH+4wWJ X-Received: by 10.28.212.203 with SMTP id l194mr142189wmg.59.1497448896177; Wed, 14 Jun 2017 07:01:36 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j6sm124914wrb.29.2017.06.14.07.01.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jun 2017 07:01:34 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6DCAB3E025C; Wed, 14 Jun 2017 15:02:09 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, pbonzini@redhat.com, rth@twiddle.net, cota@braap.org Date: Wed, 14 Jun 2017 15:02:07 +0100 Message-Id: <20170614140209.29847-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170614140209.29847-1-alex.bennee@linaro.org> References: <20170614140209.29847-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::22d Subject: [Qemu-devel] [PATCH v1 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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=xxx 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 32db19e3b9..59fea15488 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 = qemu_opts_parse_noisily(qemu_find_opts("accel"), optarg, true); optarg = qemu_opt_get(accel_opts, "accel"); if (!optarg || is_help_option(optarg)) { error_printf("Possible accelerators: kvm, xen, hax, tcg\n"); - exit(1); + exit(0); } - accel_opts = qemu_opts_create(qemu_find_opts("machine"), NULL, - false, &error_abort); - qemu_opt_set(accel_opts, "accel", optarg, &error_abort); + opts = 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 = qemu_find_opts("machine"); qemu_opts_parse_noisily(olist, "usb=on", false);