From patchwork Fri Jun 11 23:41:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 458533 Delivered-To: patch@linaro.org Received: by 2002:a17:907:7409:0:0:0:0 with SMTP id gj9csp704440ejc; Fri, 11 Jun 2021 16:43:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3gRM6XEFQx2eRkJZdoxxiw2+X/8FtO2JttJhGPAm2kmRy5zGi39lbbL+sCjvDIpelEvXT X-Received: by 2002:a92:dd89:: with SMTP id g9mr5121431iln.209.1623455001186; Fri, 11 Jun 2021 16:43:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623455001; cv=none; d=google.com; s=arc-20160816; b=iKx4ZgQXj59y4DQO8HRjGAtrHONcm900Y/6VTQykOKb6H8YDkx+ewNKVhFehowx8zs H0EiTKIqqPUorRywK/VycbY1xDnRbfqRgJDI1qA9pZ66hbU5p+js5r13QmItmmuSS7sG samwpRbnf9qFNpDOC4APL4TRs5tDDbr4wPiL0+ch5fHGnwo4JmGL16MOlaI1xesYu5qZ 3M55i+VV65A9BzP1ASTi18PaZ2/MOu74KK4SqHQHkO8FTlQtoeRFRH4FCj4ArFUun0DJ 6Jprq25/9pxH3lT1L6XWPjC26ECuaQphkSToly/UIXgNSx85UeWK4QAHbYh+9LFxpARy dVUQ== 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=20wQQlls/fCaj92TazJBcMQ1M/HJlvVa/gvE7cqK+n4=; b=0to6eT7Urn+6Y6u0D3ucKDhTR10reMirDm8dM7P86ygPt740WUNoRYyQ/PHvlsbH7J 1zHWDxN+iLdZD+ovToc58Nqk9RayAWzLvLfkElbV5wrp9dfBoSE4uTkVWF7XyJxsgIB/ qy7j2P3m2S8iiHr8SbgWYrbNbvZjjjAretHPHigbtFdXFBWwe1MCDcytWuUXnTcyR7P5 kvBVwjQSGfYJV7Z8FBXv4sJaZWDRfRC68pcZCpeOkzVbGlLZ9muTEoLq2OqEvnaNZo0x SxnA1saEmsvH1/zmve/rBeMuYZEzQs4pd0yfym/kAj97uuMbxQGQEuGUPA+PK89k+nyC jNMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AKGQ2jPv; 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 v9si9248280ilu.78.2021.06.11.16.43.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Jun 2021 16:43:21 -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=AKGQ2jPv; 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]:48262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrqo4-0002XQ-8J for patch@linaro.org; Fri, 11 Jun 2021 19:43:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrqmg-0002Ty-TR for qemu-devel@nongnu.org; Fri, 11 Jun 2021 19:41:54 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:40916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lrqmf-0002d8-4H for qemu-devel@nongnu.org; Fri, 11 Jun 2021 19:41:54 -0400 Received: by mail-pg1-x532.google.com with SMTP id j12so3672821pgh.7 for ; Fri, 11 Jun 2021 16:41:52 -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=20wQQlls/fCaj92TazJBcMQ1M/HJlvVa/gvE7cqK+n4=; b=AKGQ2jPvAkyElvDqa9QIYvsAuMiBeSvLPL0aLeAbRPCiGw7aoynD8Zn3Px1FsLw8vT YSpgXI1VCKE+i/6zpkgkHeMHPM1Wl/g5gzjxA8ujEKlMYb9fAIF5/Y5/SSVpxIzQ8JOR 6ux1mbCk8VEbKZutYXjwYrlUYTuJmI9j4hUUkqIdmGconCmDwIVjXQH1YmsUm8CFxm6q hLH7wBBTtZbU+TfdHWwwSo40DxOOcqdWMXIZlWvqw3FXy0P2N/Ka3UgMbWsoc2fQtOJk EXObcgQD7mM3MsDI/4uIQCtNI01AuDEK+LiaS82WGRGxBGIeOm0+xkfFEUSbuAzRQq6C b9tA== 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=20wQQlls/fCaj92TazJBcMQ1M/HJlvVa/gvE7cqK+n4=; b=rPciTwMV9SmeyGnGE/kADTgN5htQWRy9VEvtH4px1FOW3l3Lbryr8ay1iJJbpHgSKt CO4AK3hxJjV10b8Kf091CGzFNlahPbnqiycr4dop2odlU/w/3OnmPhD4WJ3y1v+i1ZOT 2ufvCrWeUs3CE+vvOYr2tOR4Zz8bE9ErAGur6uOIrTELUZED4Wbmqrtelrc/PoJEorUu oQu/WXoiS507MLruTvb3WzbmYciaqVVXAtACwgOqu3NeV4YlXInTZhQNSw/DPZSWJYz9 othGdxhOzxB1UVdOy6X9Cz01UPdpm/5vpPSKPfsTY4NUbbk5CONQFS5kCq1PJAk6Kaho o7eA== X-Gm-Message-State: AOAM533Jly4bBG1VDVO2Hm8JNF4IVTQspaUzYpywAS6mkjtKEaYoH2wn pNFLbGkV9OUbKxHVjKKhEtOQCMjCQuv1Ag== X-Received: by 2002:a63:fe4a:: with SMTP id x10mr5944803pgj.132.1623454911566; Fri, 11 Jun 2021 16:41:51 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 16:41:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 10/34] accel/tcg: Rename tcg_init to tcg_init_machine Date: Fri, 11 Jun 2021 16:41:20 -0700 Message-Id: <20210611234144.653682-11-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::532; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x532.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: 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" We shortly want to use tcg_init for something else. Since the hook is called init_machine, match that. Reviewed-by: Luis Pires Reviewed-by: Alex Bennée 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 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",