From patchwork Sun Jul 9 07:49:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Emilio Cota X-Patchwork-Id: 9831639 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8E643602A0 for ; Sun, 9 Jul 2017 07:54:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 736A1269E2 for ; Sun, 9 Jul 2017 07:54:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E7F527FAE; Sun, 9 Jul 2017 07:54:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E3DAD269E2 for ; Sun, 9 Jul 2017 07:54:53 +0000 (UTC) Received: from localhost ([::1]:35253 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dU73M-0006iF-OC for patchwork-qemu-devel@patchwork.kernel.org; Sun, 09 Jul 2017 03:54:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dU6zJ-0004R5-5R for qemu-devel@nongnu.org; Sun, 09 Jul 2017 03:50:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dU6zD-0002z1-UJ for qemu-devel@nongnu.org; Sun, 09 Jul 2017 03:50:40 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:42219) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dU6zD-0002vG-Ny for qemu-devel@nongnu.org; Sun, 09 Jul 2017 03:50:35 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id BC3402086C; Sun, 9 Jul 2017 03:50:31 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Sun, 09 Jul 2017 03:50:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=nN9 c5YFSSGysjE+mDDij2MShHfmKwX13IpXE6Tl6kFw=; b=sIyrBqB17Gq///Ap4Mm /2hxF7ha1+bNNblYC/n5OtMOdpkq0peKDo9y8wfcKxUGoxIKseEUr40xqO9MSVDG DXfdnvQloUV18+/OSTX1MGo0hm7vVMRA0UyZ8kG2VAJxLdwFsQgqOX6lXZcEVqc3 EC/1TBS5Ajc1QvsIln+zeERM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=nN9c5YFSSGysjE+mDDij2MShHfmKwX13IpXE6Tl6k Fw=; b=pVK5h7W8o40CowU5Ih0o19Y5lk6LsLDzck0XzM8kb5eODSW97vXlP7Ay7 5sF8nMtn89S/nEuYVMO0j94rgP0OB+tlrpVX0LpCfa688eWRu01VWrSk3lV3PT4d e63ie4M9FgB5CrGJ29qfmKZUGJiC5mb6/1r2xtyanicfUK4+Xb+vWlcpJjI65kuX LY5vzG2VRthudGkaFbqdO2ZSMZrHsC6v3lhlLMB7ZuqChIlb7QTNsdcEJLPzxKWA NaBS5N/wduX2A2bGKGMefEjey9wxzyOWCFpx9GQHB/4qupZpcDWjJPxs5CeV2PVo GDC6i8VDb91chY2ifqhXpYAJv3nDg== X-ME-Sender: X-Sasl-enc: 7ejrjEwLBLN7zw0l66U+hISYhQkCa7k42wHevTtKYBen 1499586631 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 7B80C7E70C; Sun, 9 Jul 2017 03:50:31 -0400 (EDT) From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Sun, 9 Jul 2017 03:49:53 -0400 Message-Id: <1499586614-20507-2-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499586614-20507-1-git-send-email-cota@braap.org> References: <1499586614-20507-1-git-send-email-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.27 Subject: [Qemu-devel] [PATCH 01/22] vl: fix breakage of -tb-size 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: Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Commit e7b161d573 ("vl: add tcg_enabled() for tcg related code") adds a check to exit the program when !tcg_enabled() while parsing the -tb-size flag. It turns out that when the -tb-size flag is evaluated, tcg_enabled() can only return 0, since it is set (or not) much later by configure_accelerator(). Fix it by unconditionally exiting if the flag is passed to a QEMU binary built with !CONFIG_TCG. Signed-off-by: Emilio G. Cota Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée Tested-by: Alex Bennée --- vl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index d17c863..9ece570 100644 --- a/vl.c +++ b/vl.c @@ -3933,10 +3933,10 @@ int main(int argc, char **argv, char **envp) configure_rtc(opts); break; case QEMU_OPTION_tb_size: - if (!tcg_enabled()) { - error_report("TCG is disabled"); - exit(1); - } +#ifndef CONFIG_TCG + error_report("TCG is disabled"); + exit(1); +#endif if (qemu_strtoul(optarg, NULL, 0, &tcg_tb_size) < 0) { error_report("Invalid argument to -tb-size"); exit(1);