From patchwork Sun May 2 23:18:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 430463 Delivered-To: patch@linaro.org Received: by 2002:a17:907:764d:0:0:0:0 with SMTP id kj13csp1223208ejc; Sun, 2 May 2021 16:22:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxmhX4/LVv0loLOG8pj5oPZlpdkWvqhbSISn31U/+xgOG9e/NoEgxHRI99DcwXnD8PD6a4 X-Received: by 2002:a02:308e:: with SMTP id q136mr15889136jaq.47.1619997775635; Sun, 02 May 2021 16:22:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619997775; cv=none; d=google.com; s=arc-20160816; b=KhosXLyflWZL1HKDCg4Pztvdbp99FIK8zn7EFTM56eY85QsqzBThIGoNouKGVx+0ji Cj13NS7WsgmfhcTqqJqwRFQHUwzQ1/9MsjAgBJMnxRRNfOY++y7Od+P2CCPXXWW2XjsW PWpC8y1tEepEZZjh87QgDQ0N2nHCQdEsfLnI7joL1Xt3gEGt10jwMiD6LTbHvpnTdSJl aArhIznfg32QE5WutB0+m8q2dXduScrtJqDmBS6w7LH7W7Vp+2IrKu6TJLPGcihFKeZ/ DoO1oZlt9TC3uzmVrtNT16wBbm2EdcXz5IJRwSXzbsngPX9NjkyPC2+ZZ6Y+sVZF1tAM buSg== 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=M+GW/FjdFE0LjCNjl+PKpujGwHht+vUuynWRRTNqZ50=; b=zZfjVYp0RbTgAqKPVsypnr42qdI2ceYEFDGZC8zS8Oc9IRoko6rKZ72/4hpwk9UhuH nz1DbH1iTaUKr/PZ5OJ/UZyGl0m7NMyTTmErdWg21umhxQAsQoNA5UpahXhMJ7VCTaaq BLBvL02mCYVnvm6ohGRgvqCOEkmnbc9D0/cHIHdw7WIMY4wQDf3umFH57CeSYrQasrzx 5PowsOLYpnqLhix49v7KaL1QbwFYDIqPIa6eNK6XiF3mTSEyq7pPZsg5J2tiztIualSX sKUCV9VkUEpUJZM/qlqt5cttkN7z94XTg/JuJ0PsrhnEd2mpaT/ADmI61bsC+aguhFEz CFoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ynpYBzhT; 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=pass (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 z11si15102057ioq.81.2021.05.02.16.22.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 02 May 2021 16:22:55 -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=pass header.i=@linaro.org header.s=google header.b=ynpYBzhT; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldLQM-0003Td-Vv for patch@linaro.org; Sun, 02 May 2021 19:22:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldLMW-0008HQ-DN for qemu-devel@nongnu.org; Sun, 02 May 2021 19:18:56 -0400 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]:39652) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldLMU-0002uO-Nm for qemu-devel@nongnu.org; Sun, 02 May 2021 19:18:56 -0400 Received: by mail-pg1-x530.google.com with SMTP id s22so2452477pgk.6 for ; Sun, 02 May 2021 16:18: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=M+GW/FjdFE0LjCNjl+PKpujGwHht+vUuynWRRTNqZ50=; b=ynpYBzhTcxaiE3SUl1tIz4geQnWN7S21LcTW9hRgX/HtOuKvCHnyPHfF4fnrDCClmA eU36oVGpjgwNvXYrE10NF2//9R8jFYJ6sSR/AQ6UPXAA+lJgjj7L5Bu7NcdCANfbQFT8 yjSUJbJo8y/YS4zbVmJYBusFRTcCQTXEXOva9Zgc4W2EjojvrtK1JWhhFiFY4b3k4tSH mnCl4AWWd15909oiI2vZcmdJh+KDT3ft82u8kuEmcEunEJWFTsf3sGEireQ4aHNic4Vv EoyEp2+03CFFOy6pr/wfVqgo2c9kNL60dRpXs+8rg/ydmUUtkXW4jFvvB/JdAMvEsAYi LBaQ== 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=M+GW/FjdFE0LjCNjl+PKpujGwHht+vUuynWRRTNqZ50=; b=N3G2GIbKI4tERc3s3rnrkax61mTCdY14W2UjMCGIWJvlvkXyLnvtYWGiNUoAvBBdtE nJXsckdg6vvkC636rS5rhCr0740vtl97P9CZugcfWyvwcuqCk4YsVSLReqkDxQaH1M4y 4L9uw8u5o1bQ8/RFJQTYx9Ei9/2tWyt2T/YmwytZj8z8M6Gb+6mOvsH06u4AnPRWohWx 9/IN/b0YlLtFDBomyJ6WUinY/h1JD+p1CkGrLDKpwDp0hLVN9/C6/Rwrhq8z+rFpTJnF PoklAfXbLabADYJ6zuEBAXlpwg+n44zCIBq3pOm6cl6M0g1c0RAHiSMgs6NKNosDEaKe FhGg== X-Gm-Message-State: AOAM532hQy7gCnahWeyCNa/q5019xhTL1+tDt50TkLE5JrhJPhZTtqG+ jImRkpqls+EgIEUF8cGTc2O8jOwW8vqffw== X-Received: by 2002:a63:f90d:: with SMTP id h13mr15712450pgi.18.1619997533531; Sun, 02 May 2021 16:18:53 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id k17sm7146236pfa.68.2021.05.02.16.18.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 May 2021 16:18:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 10/28] accel/tcg: Rename tcg_init to tcg_init_machine Date: Sun, 2 May 2021 16:18:26 -0700 Message-Id: <20210502231844.1977630-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210502231844.1977630-1-richard.henderson@linaro.org> References: <20210502231844.1977630-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::530; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x530.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=ham 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We shortly want to use tcg_init for something else. Since the hook is called init_machine, match that. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- accel/tcg/tcg-all.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.25.1 Reviewed-by: Alex Bennée Reviewed-by: Luis Pires diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index f132033999..30d81ff7f5 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -105,7 +105,7 @@ static void tcg_accel_instance_init(Object *obj) bool mttcg_enabled; -static int tcg_init(MachineState *ms) +static int tcg_init_machine(MachineState *ms) { TCGState *s = TCG_STATE(current_accel()); @@ -189,7 +189,7 @@ static void tcg_accel_class_init(ObjectClass *oc, void *data) { AccelClass *ac = ACCEL_CLASS(oc); ac->name = "tcg"; - ac->init_machine = tcg_init; + ac->init_machine = tcg_init_machine; ac->allowed = &tcg_allowed; object_class_property_add_str(oc, "thread",