From patchwork Sun Mar 14 21:27:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 12138053 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7F98C433E0 for ; Sun, 14 Mar 2021 21:46:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7548664E02 for ; Sun, 14 Mar 2021 21:46:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7548664E02 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLYYi-0001xw-FT for qemu-devel@archiver.kernel.org; Sun, 14 Mar 2021 17:46:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLYH1-000667-Ts for qemu-devel@nongnu.org; Sun, 14 Mar 2021 17:27:44 -0400 Received: from mail-qv1-xf36.google.com ([2607:f8b0:4864:20::f36]:40914) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLYGx-0008CO-95 for qemu-devel@nongnu.org; Sun, 14 Mar 2021 17:27:42 -0400 Received: by mail-qv1-xf36.google.com with SMTP id d10so514675qve.7 for ; Sun, 14 Mar 2021 14:27: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 :mime-version:content-transfer-encoding; bh=M+GW/FjdFE0LjCNjl+PKpujGwHht+vUuynWRRTNqZ50=; b=W9EWIAYYbiO2Q6ZUxeVr5YPtTr1LDApzVKQWZ2GzhKufQLanv30gPAhtF6PeHWozgu X68zP/nd66KSGUoe0/S8TGAzbi2XUgaVxh0deeARPH4dDlPfBdciinj5EIzF935ZUNP0 r8pWZ25Ju6BVc69QEmrfvmD79Kv4LiMH39DeXhnifp8QAcQkN0uYKbRJ04viTpIZ60/a DIcg4VR3fS2FjXk4EbDzC/GHEG1m604hNu9t5Xgron0XfBivW0D9lpW+lpqU7wmRoaii SYSZfr+ke1/TOUe6dm+fKTiVddSFsAwfBeBMkWF8XhVfsmUIHrju9SW6nv0Rvgiv0gjW mU2w== 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=HEk84H0FpkA0yYV8JUeYJ2RIMpBP0Zc406h8y8eVp/zWaZWB9TTJGZqpuci3D4+jin G1PBPinBScep6uZ+jTArc51NmTweu/CiyA86S8m5UhAA6PqeWHGZSqXCzZn0AcjzdKU/ dx9MrDDQ0fnite42NcBUOGVsBiNpsAyMjYqPTK26zZn+OlxwS9kFHeDZwHyTRccXpRt9 y8SrM+Z/c2vAWgfXFva6GJWM0Ur0xDVfKVRtpDulEWHh1T0btPkYtR8TSbwA1ZbyFpeV V2ROX2jsbHlfm0Cj/tTOhjOcbM2dPr/Z0ac4R16wItsb8Agn2cbOKGLcK3AEbdfwSWMs e49w== X-Gm-Message-State: AOAM532Sc+3e2TV+ICBK4eRAeYes2qCRM6rwWW7BQNwDBx6DwagYAoax GmLdtF5vJkzthDamUf8TjJQ75o7oF/gqv3V7 X-Google-Smtp-Source: ABdhPJy1s8Q4SEFBr7HTmMDqzo411lI0IoPR4kRh9KdkkbZ7h95g0C3tdNBBlx7ZZpo2ir0XF6i1Hw== X-Received: by 2002:ad4:4e53:: with SMTP id eb19mr8088279qvb.8.1615757258393; Sun, 14 Mar 2021 14:27:38 -0700 (PDT) Received: from localhost.localdomain (fixed-187-189-51-144.totalplay.net. [187.189.51.144]) by smtp.gmail.com with ESMTPSA id t2sm9337749qtd.13.2021.03.14.14.27.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Mar 2021 14:27:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 10/29] accel/tcg: Rename tcg_init to tcg_init_machine Date: Sun, 14 Mar 2021 15:27:05 -0600 Message-Id: <20210314212724.1917075-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210314212724.1917075-1-richard.henderson@linaro.org> References: <20210314212724.1917075-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::f36; envelope-from=richard.henderson@linaro.org; helo=mail-qv1-xf36.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: r.bolshakov@yadro.com, j@getutm.app, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.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(-) 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",