From nobody Mon Feb 9 16:52:26 2026 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.zohomail.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 1499958323277683.2257451569435; Thu, 13 Jul 2017 08:05:23 -0700 (PDT) Received: from localhost ([::1]:60563 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVffy-00050u-Sc for importer@patchew.org; Thu, 13 Jul 2017 11:05:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVf4p-0002H5-Mw for qemu-devel@nongnu.org; Thu, 13 Jul 2017 10:26:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVf4l-0004Uw-MD for qemu-devel@nongnu.org; Thu, 13 Jul 2017 10:26:47 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:32961) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVf4l-0004US-Fi for qemu-devel@nongnu.org; Thu, 13 Jul 2017 10:26:43 -0400 Received: by mail-wr0-f195.google.com with SMTP id n18so1463783wrb.0 for ; Thu, 13 Jul 2017 07:26:43 -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 k75sm6042448wmh.10.2017.07.13.07.25.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 07:25:41 -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=9lGJEWJbYBmkjXEvRXszHRCa68/On+ooXkNp2NHh1E4=; b=jFlaEIBvcVyLTVUGgIuWhLqN8l2viqebfT8QxcAZuIkHam5zC4E7m47QC5MgptV51B JMnvN9yerV9G/7hxlXS7dUjK9JP3QTswRJ2LaOvlQpX7WPv9uIpTYMLIlT6tkE9y4x8y llYbJLjtKg0ew+GQF5z3od6DOQCez6/UjwzqEfG1W9gxZexQ1Dw5KE29pIh7N6bg7imS AMxnH0hmB6LO/2tJYbiF5wnxAU8lxR/TN/wGEGOVufrHzwZbERDJIykev0YvCuSC3AiN cOu+VJ+PAyf9Q90hxqW54PQQFNJSIIxPOJ5QWQcTs4le+EZFkEyGhx9+ZvRxmhKHcp6I jLcw== 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=9lGJEWJbYBmkjXEvRXszHRCa68/On+ooXkNp2NHh1E4=; b=Y8vkRutBPZqBzqldB/t4U6SBHcQSWiBujGgLReUfzA229P0UfM3kU20IxGYcgeLopR CDjwaSsqsgbLpoUaDX1KGwKd/+uAgpMiJsR3RuIlegZDR7nPjbQjTcDiohaxCkS1hp8k JOcVIQqRXjzWIQxaI2wq5boEO2O0W5VSvu4VwH1RXMq78/STF1LL7vU7om7hS2Orv66G avMCwzQtpyTLqe/deB8w7QTrYZ+jBGT6koE97ZICpZze4GFpyoyASsc5BkyrjATcvLCY ui5wfqPDLtvCyG0TEEPmjIlgau6U6WRX0CZMMhWRZs9r7/Ssokra4rbLI1w54KJrA+vj p5/g== X-Gm-Message-State: AIVw110By/S/OvV7/qfIIfE8yRKCW0ik84hP3CgYnAsYexQ/YjtUwxbk J0KjFZAjh/Gk1XSwGow= X-Received: by 10.223.154.206 with SMTP id a72mr1893858wrc.47.1499955942173; Thu, 13 Jul 2017 07:25:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 13 Jul 2017 16:24:33 +0200 Message-Id: <1499955874-10954-41-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1499955874-10954-1-git-send-email-pbonzini@redhat.com> References: <1499955874-10954-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.128.195 Subject: [Qemu-devel] [PULL 40/41] 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: "Emilio G. Cota" 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: "Emilio G. Cota" 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 Signed-off-by: Paolo Bonzini --- vl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index f7560de..85cdbbf 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); --=20 1.8.3.1