From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 AA5BECA9EAF for ; Thu, 24 Oct 2019 08:27:28 +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 714AF20856 for ; Thu, 24 Oct 2019 08:27:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="ZdaYAK8o" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 714AF20856 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNYSs-0004d9-U8 for qemu-devel@archiver.kernel.org; Thu, 24 Oct 2019 04:27:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36876) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNYKb-00050m-G6 for qemu-devel@nongnu.org; Thu, 24 Oct 2019 04:18:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNYKZ-0005S3-QG for qemu-devel@nongnu.org; Thu, 24 Oct 2019 04:18:53 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:41411 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNYKZ-0005Mw-Dh; Thu, 24 Oct 2019 04:18:51 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 46zKrc3xhsz9sSG; Thu, 24 Oct 2019 19:18:38 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1571905120; bh=Xs8W+ykQ9G+OhrnzjhaEi48Z3MoKVYbgdQ4As7qwqyY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZdaYAK8oYIcLEuSh3jRxfGvwNzGBup5FKcMbTNwpTVadOJHcyMHzQpVqbUQ7Sp45U rPBs90s05XH51Cec0oC6zFSW/8kTxba7vw/WdMB+hBbULNZc1FWufn13xAyAo70tf2 h8MuUcaEThjsGscl2NFnqfSeDxr0L6qJy7IF5avE= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 27/28] ppc/pnv: Fix naming of routines realizing the CPUs Date: Thu, 24 Oct 2019 19:18:12 +1100 Message-Id: <20191024081813.2115-28-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191024081813.2115-1-david@gibson.dropbear.id.au> References: <20191024081813.2115-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 203.11.71.1 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: lvivier@redhat.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: C=C3=A9dric Le Goater The 'vcpu' suffix is inherited from the sPAPR machine. Use better names for PowerNV. Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Greg Kurz Message-Id: <20191022163812.330-7-clg@kaod.org> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: David Gibson --- hw/ppc/pnv_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c index be0310ac03..e81cd3a3e0 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.c @@ -162,7 +162,7 @@ static const MemoryRegionOps pnv_core_power9_xscom_op= s =3D { .endianness =3D DEVICE_BIG_ENDIAN, }; =20 -static void pnv_realize_vcpu(PowerPCCPU *cpu, PnvChip *chip, Error **err= p) +static void pnv_core_cpu_realize(PowerPCCPU *cpu, PnvChip *chip, Error *= *errp) { CPUPPCState *env =3D &cpu->env; int core_pir; @@ -247,7 +247,7 @@ static void pnv_core_realize(DeviceState *dev, Error = **errp) } =20 for (j =3D 0; j < cc->nr_threads; j++) { - pnv_realize_vcpu(pc->threads[j], pc->chip, &local_err); + pnv_core_cpu_realize(pc->threads[j], pc->chip, &local_err); if (local_err) { goto err; } @@ -269,7 +269,7 @@ err: error_propagate(errp, local_err); } =20 -static void pnv_unrealize_vcpu(PowerPCCPU *cpu) +static void pnv_core_cpu_unrealize(PowerPCCPU *cpu) { PnvCPUState *pnv_cpu =3D pnv_cpu_state(cpu); =20 @@ -289,7 +289,7 @@ static void pnv_core_unrealize(DeviceState *dev, Erro= r **errp) qemu_unregister_reset(pnv_core_reset, pc); =20 for (i =3D 0; i < cc->nr_threads; i++) { - pnv_unrealize_vcpu(pc->threads[i]); + pnv_core_cpu_unrealize(pc->threads[i]); } g_free(pc->threads); } --=20 2.21.0