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.8 required=3.0 tests=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 E9A44CA9EA0 for ; Tue, 22 Oct 2019 14:42:35 +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 BE9B92086D for ; Tue, 22 Oct 2019 14:42:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BE9B92086D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMvMo-0003TP-Se for qemu-devel@archiver.kernel.org; Tue, 22 Oct 2019 10:42:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40260) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMuVf-0004eo-5f for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:47:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMuVc-0008PB-Kf for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:47:39 -0400 Received: from 13.mo3.mail-out.ovh.net ([188.165.33.202]:38914) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iMuVb-0008Nx-Uo for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:47:36 -0400 Received: from player772.ha.ovh.net (unknown [10.108.57.95]) by mo3.mail-out.ovh.net (Postfix) with ESMTP id 8157822C059 for ; Tue, 22 Oct 2019 15:47:34 +0200 (CEST) Received: from kaod.org (deibp9eh1--blueice1n4.emea.ibm.com [195.212.29.166]) (Authenticated sender: clg@kaod.org) by player772.ha.ovh.net (Postfix) with ESMTPSA id ACBFEB3F347C; Tue, 22 Oct 2019 13:47:22 +0000 (UTC) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Subject: [PATCH v4 6/7] ppc/pnv: Fix naming of routines realizing the CPUs Date: Tue, 22 Oct 2019 15:46:31 +0200 Message-Id: <20191022134632.29098-7-clg@kaod.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191022134632.29098-1-clg@kaod.org> References: <20191022134632.29098-1-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Ovh-Tracer-Id: 609674799650933734 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrkeejgdeikecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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: 188.165.33.202 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=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Greg Kurz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The 'vcpu' suffix is inherited from the sPAPR machine. Use better names for PowerNV. Signed-off-by: C=C3=A9dric Le Goater --- 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 127107ab7c63..328ad07c8d06 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.c @@ -163,7 +163,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; @@ -248,7 +248,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; } @@ -270,7 +270,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 @@ -290,7 +290,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