From nobody Thu Jul 4 03:50:37 2024 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544094743426700.1840009402805; Thu, 6 Dec 2018 03:12:23 -0800 (PST) Received: from localhost ([::1]:40132 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUrZo-0002zN-CL for importer@patchew.org; Thu, 06 Dec 2018 06:12:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUrST-00033F-PL for qemu-devel@nongnu.org; Thu, 06 Dec 2018 06:04:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUrSO-0000Jc-1r for qemu-devel@nongnu.org; Thu, 06 Dec 2018 06:04:41 -0500 Received: from out1.zte.com.cn ([202.103.147.172]:41252 helo=mxct.zte.com.cn) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gUrS7-00007w-6z; Thu, 06 Dec 2018 06:04:24 -0500 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id 40B748D9B66522D37466; Thu, 6 Dec 2018 19:04:11 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id wB6B3wWM072784; Thu, 6 Dec 2018 19:03:58 +0800 (GMT-8) (envelope-from peng.hao2@zte.com.cn) Received: from localhost.localdomain.localdomain ([10.74.120.59]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2018120619042995-15124389 ; Thu, 6 Dec 2018 19:04:29 +0800 From: Peng Hao To: peter.maydell@linaro.org, drjones@redhat.com, philmd@redhat.com Date: Thu, 6 Dec 2018 19:25:57 +0800 Message-Id: <1544095560-70807-3-git-send-email-peng.hao2@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1544095560-70807-1-git-send-email-peng.hao2@zte.com.cn> References: <1544095560-70807-1-git-send-email-peng.hao2@zte.com.cn> MIME-Version: 1.0 X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2018-12-06 19:04:30, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2018-12-06 19:03:47 Content-Transfer-Encoding: quoted-printable X-MAIL: mse01.zte.com.cn wB6B3wWM072784 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 202.103.147.172 Subject: [Qemu-devel] [PATCH V12 2/5] hw/misc/pvpanic: Cosmetic renaming 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: Peng Hao , qemu-arm@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 To ease the MMIO device addition in the next patch, rename: - ISA_PVPANIC_DEVICE -> PVPANIC_ISA_DEVICE. - MemoryRegion io -> mr. Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Peng Hao --- hw/misc/pvpanic.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 9d8961b..0f23a67 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -25,8 +25,8 @@ /* The pv event value */ #define PVPANIC_PANICKED (1 << PVPANIC_F_PANICKED) =20 -#define ISA_PVPANIC_DEVICE(obj) \ - OBJECT_CHECK(PVPanicState, (obj), TYPE_PVPANIC) +#define PVPANIC_ISA_DEVICE(obj) \ + OBJECT_CHECK(PVPanicISAState, (obj), TYPE_PVPANIC) =20 static void handle_event(int event) { @@ -45,12 +45,16 @@ static void handle_event(int event) =20 #include "hw/isa/isa.h" =20 -typedef struct PVPanicState { +/* PVPanicISAState for ISA device and + * use ioport. + */ +typedef struct PVPanicISAState { ISADevice parent_obj; - - MemoryRegion io; + /*< private>*/ uint16_t ioport; -} PVPanicState; + /**/ + MemoryRegion mr; +} PVPanicISAState; =20 /* return supported events on read */ static uint64_t pvpanic_ioport_read(void *opaque, hwaddr addr, unsigned si= ze) @@ -75,15 +79,15 @@ static const MemoryRegionOps pvpanic_ops =3D { =20 static void pvpanic_isa_initfn(Object *obj) { - PVPanicState *s =3D ISA_PVPANIC_DEVICE(obj); + PVPanicISAState *s =3D PVPANIC_ISA_DEVICE(obj); =20 - memory_region_init_io(&s->io, OBJECT(s), &pvpanic_ops, s, "pvpanic", 1= ); + memory_region_init_io(&s->mr, OBJECT(s), &pvpanic_ops, s, "pvpanic", 1= ); } =20 static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp) { ISADevice *d =3D ISA_DEVICE(dev); - PVPanicState *s =3D ISA_PVPANIC_DEVICE(dev); + PVPanicISAState *s =3D PVPANIC_ISA_DEVICE(dev); FWCfgState *fw_cfg =3D fw_cfg_find(); uint16_t *pvpanic_port; =20 @@ -96,11 +100,11 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Er= ror **errp) fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", pvpanic_port, sizeof(*pvpanic_port)); =20 - isa_register_ioport(d, &s->io, s->ioport); + isa_register_ioport(d, &s->mr, s->ioport); } =20 static Property pvpanic_isa_properties[] =3D { - DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicState, ioport, 0x505), + DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicISAState, ioport, 0x505= ), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -116,7 +120,7 @@ static void pvpanic_isa_class_init(ObjectClass *klass, = void *data) static TypeInfo pvpanic_isa_info =3D { .name =3D TYPE_PVPANIC, .parent =3D TYPE_ISA_DEVICE, - .instance_size =3D sizeof(PVPanicState), + .instance_size =3D sizeof(PVPanicISAState), .instance_init =3D pvpanic_isa_initfn, .class_init =3D pvpanic_isa_class_init, }; --=20 1.8.3.1