From nobody Thu Nov 6 19:13:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488344638691958.9584218129348; Tue, 28 Feb 2017 21:03:58 -0800 (PST) Received: from localhost ([::1]:38443 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciwQf-0008MU-HH for importer@patchew.org; Wed, 01 Mar 2017 00:03:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciw7y-0008HC-RA for qemu-devel@nongnu.org; Tue, 28 Feb 2017 23:44:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ciw7t-0000FZ-Ti for qemu-devel@nongnu.org; Tue, 28 Feb 2017 23:44:38 -0500 Received: from ozlabs.org ([103.22.144.67]:33963) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ciw7t-0000DI-ID; Tue, 28 Feb 2017 23:44:33 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3vY2sV4tfxz9sPT; Wed, 1 Mar 2017 15:44:13 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1488343454; bh=6p7JM7UG7hFxBgXuHFPL/SCIAhkCNIVlCuC4PlczAjM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=egX6qLoaxBKs/W7F0RHHXS2fTht5QyQpwRRuU8OZ8jQZAwX9U/0uRZAuhRoCnFmFx 3hk/z6V3+n0Bx2UHiDFI2hQfxW/sZL5IsJ4Jbbk0Q4UqJCNaJh7x5nQNYekRn/GZMn zCjnHVDFacgix5a8FR4C4D9shaKH6nl9CDtzFKRU= From: David Gibson To: peter.maydell@linaro.org Date: Wed, 1 Mar 2017 15:43:54 +1100 Message-Id: <20170301044405.1792-40-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170301044405.1792-1-david@gibson.dropbear.id.au> References: <20170301044405.1792-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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: 103.22.144.67 Subject: [Qemu-devel] [PULL 39/50] ppc/xics: simplify the cpu_setup() handler X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, agraf@suse.de, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: C=C3=A9dric Le Goater The cpu_setup() handler currently takes a 'XICSState *' argument to grab the kernel ICP file descriptor. This interface can be simplified by using the 'xics' backlink of the ICP object. This change is also required by subsequent patches which makes use of the QOM interface for XICS. Signed-off-by: C=C3=A9dric Le Goater Signed-off-by: David Gibson --- hw/intc/xics.c | 5 +++-- hw/intc/xics_kvm.c | 9 ++------- include/hw/ppc/xics.h | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index f828bcb..a5be0d8 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -66,14 +66,15 @@ void xics_cpu_setup(XICSState *xics, PowerPCCPU *cpu) CPUState *cs =3D CPU(cpu); CPUPPCState *env =3D &cpu->env; ICPState *ss =3D &xics->ss[cs->cpu_index]; - XICSStateClass *info =3D XICS_COMMON_GET_CLASS(xics); + XICSStateClass *info; =20 assert(cs->cpu_index < xics->nr_servers); =20 ss->cs =3D cs; =20 + info =3D XICS_COMMON_GET_CLASS(xics); if (info->cpu_setup) { - info->cpu_setup(xics, cpu); + info->cpu_setup(ss, cpu); } =20 switch (PPC_INPUT(env)) { diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 86ddf47..7588280 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -324,16 +324,11 @@ static const TypeInfo ics_kvm_info =3D { /* * XICS-KVM */ -static void xics_kvm_cpu_setup(XICSState *xics, PowerPCCPU *cpu) +static void xics_kvm_cpu_setup(ICPState *ss, PowerPCCPU *cpu) { - CPUState *cs; - ICPState *ss; + CPUState *cs =3D CPU(cpu); int ret; =20 - cs =3D CPU(cpu); - ss =3D &xics->ss[cs->cpu_index]; - - assert(cs->cpu_index < xics->nr_servers); if (kernel_xics_fd =3D=3D -1) { abort(); } diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 01ca5e2..8325dbd 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -74,7 +74,7 @@ typedef struct XICSFabric XICSFabric; struct XICSStateClass { DeviceClass parent_class; =20 - void (*cpu_setup)(XICSState *icp, PowerPCCPU *cpu); + void (*cpu_setup)(ICPState *icp, PowerPCCPU *cpu); }; =20 struct XICSState { --=20 2.9.3