From patchwork Fri Jun 11 23:41:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 458633 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp1374379jae; Fri, 11 Jun 2021 16:57:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDuxrpqbuOYrBPjmK1uE77C2gTtFHmDRDwG15Qzri4D9KWbEdlP9nhNrCLVzmfhRjVzQTb X-Received: by 2002:a05:6e02:12c9:: with SMTP id i9mr4999412ilm.17.1623455853611; Fri, 11 Jun 2021 16:57:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623455853; cv=none; d=google.com; s=arc-20160816; b=A1E0fuipeqbKhTILA7+C46QVyXKv73WWJRjv6a/0pf3YaX9ZiLzFJVNBQOQTWL992y K5SlAr2S7mii74OBlYgj/ZQH3J3YomoADwxeEREkywH6uE10yOjnccRMYOkRyi+fzUcM gtrK+YuOQnkxC/+nmMysYBAf5G9zyveApjzqJeALjQXDDEwdMYbO0NHqnkTUPSJI/NcF HPtuheKHovnc/JFXDVDtJwI0YQkj+OrW4NoTWPa6vGL6sJGAG0gp0gViKb0qLxJw2E/o mWqlG+ru5u0Dj1Sz1DJPee02Yg/b3i5CIx7m+51q0Ntt5PuZANx7QYnlZtHfGjunfoTI q4dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=qR3R54ldm2hlks4jTNDifo1l/88jznlHccjT2381AZE=; b=lSM3F+xUMDyRw5qe12VbX/uZWe1CGdLsExI6UxLKH/T9JRoL0WJjgygArXKyzIku3K m13QP3iXhw0D7BcRo5Upr6BQryrPOzA5/iwSGOLAF+5XTKD400NkfomKJbbDvaXMBV6W DYXuH0ZNwxXwnxsV2oFvmpZ0BFsfApynkDIfsld/T5mEUF5wfWQHd16PvhtG28bOXkbu v6IX2OQfQrD9bO/RICsPCUaQa+hqoCEzjdOpJ/c04d1Gh7XqhQeGoH5Qqo3RYwZGZ6bL l1yuXxKULaFV1RfbgRDPy8Uf8tcxCG2OpVxy6+hToYzAVUw9NoUm/dq4zjMMXJyQcN+g QcMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HFqOKFv1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n6si7601780ili.152.2021.06.11.16.57.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Jun 2021 16:57:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HFqOKFv1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrr1p-00010e-2L for patch@linaro.org; Fri, 11 Jun 2021 19:57:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrqmq-00031V-LR for qemu-devel@nongnu.org; Fri, 11 Jun 2021 19:42:04 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:38835) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lrqmg-0002ep-R8 for qemu-devel@nongnu.org; Fri, 11 Jun 2021 19:42:04 -0400 Received: by mail-pl1-x631.google.com with SMTP id 69so3599959plc.5 for ; Fri, 11 Jun 2021 16:41:54 -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 :mime-version:content-transfer-encoding; bh=qR3R54ldm2hlks4jTNDifo1l/88jznlHccjT2381AZE=; b=HFqOKFv1yij89TQD7WLpcIcI/eicB91mmdQf2Lx/EmLYmGjWoKs/53PcYJEFJAF5BD Cv8uMZ+DFxb198ZMSrOGz7JRIysCxcm2AlevJbKsFOYxu3KJqnfxfO6QaBPK8pHio2H5 eFtoGBERNo9kMRRfnkEzhaXt03k/JSMJwCqSR4UGGNKpZykvri2TfkCZBYp7WtOYemcM /eqtAfMlsA6qWE2A3Sd2jiGn5uN3ZtH0jhtOC96vmINFQ1rsUkWWGADEACD4SLdg04dh oDmU8YTmmsGXmx0dUYuFyUZmHBhOiUxzD1iBr0ug/a6kOBFyQZQZ/4ptfctAUa28U9sc zAIw== 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:mime-version:content-transfer-encoding; bh=qR3R54ldm2hlks4jTNDifo1l/88jznlHccjT2381AZE=; b=WU6K3UOm1QHmQXCo/WFGUrHNlS07+SpqQnx2O/LTLBB5zt5/vbMD1qZZVRvHalMjtb ErcDqAByZCVSPARBmZPv1HqzTRkOlpnk/nbzd7EszMg7VOaxArZneZZ78s6zubS2laVy EONhTJYYDUCBg5XMu8y4fDTUFUsxaIQX8jXnFOz++UBuWukSWCouSt/H6KocIjAaH99Y RS6TIm1iY99fYMxNnLrUykPHc9lNIwOh3Pz4UzbO4NONF0R8ZNoGN9nI3x7MrNEJ+2BJ C0a2ggjfXNMnrF2B4CkcOwo3v3+bBWah/LVSoZHShr2EgJv74Ragh0eFGDdwWVqOB/8J JTAg== X-Gm-Message-State: AOAM532HnHqcy4G8NGMDQ3IV+rhpvNc9QU9OzxKNlcowXfA/rTbWFeCl UJQwm31t6nItGYt6QbitUoY6l8y0jplrOQ== X-Received: by 2002:a17:90a:4a89:: with SMTP id f9mr11571593pjh.50.1623454913496; Fri, 11 Jun 2021 16:41:53 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id q23sm6139829pgm.31.2021.06.11.16.41.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 16:41:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 13/34] accel/tcg: Use MiB in tcg_init_machine Date: Fri, 11 Jun 2021 16:41:23 -0700 Message-Id: <20210611234144.653682-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611234144.653682-1-richard.henderson@linaro.org> References: <20210611234144.653682-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luis Pires , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Alex Bennée Reviewed-by: Luis Pires Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- accel/tcg/tcg-all.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index e990180c4b..1ee89902c3 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -32,6 +32,7 @@ #include "qemu/error-report.h" #include "qemu/accel.h" #include "qapi/qapi-builtin-visit.h" +#include "qemu/units.h" #include "internal.h" struct TCGState { @@ -115,7 +116,7 @@ static int tcg_init_machine(MachineState *ms) page_init(); tb_htable_init(); - tcg_init(s->tb_size * 1024 * 1024, s->splitwx_enabled); + tcg_init(s->tb_size * MiB, s->splitwx_enabled); #if defined(CONFIG_SOFTMMU) /*