From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2peb-0004U9-9W for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2peZ-0003pc-0u for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:25 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46357 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2peY-0003pE-Ra for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:22 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 5E7D3A5359 for ; Fri, 26 Jul 2013 23:34:22 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 26 Jul 2013 23:34:04 +0200 Message-Id: <1374874454-15549-5-git-send-email-afaerber@suse.de> In-Reply-To: <1374874454-15549-1-git-send-email-afaerber@suse.de> References: <1374874454-15549-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next for-1.6 04/14] eccmemctl: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/misc/eccmemctl.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c index 3de9675..96a69d4 100644 --- a/hw/misc/eccmemctl.c +++ b/hw/misc/eccmemctl.c @@ -120,8 +120,12 @@ #define ECC_DIAG_SIZE 4 #define ECC_DIAG_MASK (ECC_DIAG_SIZE - 1) =20 +#define TYPE_ECC_MEMCTL "eccmemctl" +#define ECC_MEMCTL(obj) OBJECT_CHECK(ECCState, (obj), TYPE_ECC_MEMCTL) + typedef struct ECCState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem, iomem_diag; qemu_irq irq; uint32_t regs[ECC_NREGS]; @@ -273,13 +277,14 @@ static const VMStateDescription vmstate_ecc =3D { =20 static void ecc_reset(DeviceState *d) { - ECCState *s =3D container_of(d, ECCState, busdev.qdev); + ECCState *s =3D ECC_MEMCTL(d); =20 - if (s->version =3D=3D ECC_MCC) + if (s->version =3D=3D ECC_MCC) { s->regs[ECC_MER] &=3D ECC_MER_REU; - else + } else { s->regs[ECC_MER] &=3D (ECC_MER_VER | ECC_MER_IMPL | ECC_MER_MRR = | ECC_MER_DCI); + } s->regs[ECC_MDR] =3D 0x20; s->regs[ECC_MFSR] =3D 0; s->regs[ECC_VCR] =3D 0; @@ -292,7 +297,7 @@ static void ecc_reset(DeviceState *d) =20 static int ecc_init1(SysBusDevice *dev) { - ECCState *s =3D FROM_SYSBUS(ECCState, dev); + ECCState *s =3D ECC_MEMCTL(dev); =20 sysbus_init_irq(dev, &s->irq); s->regs[0] =3D s->version; @@ -325,7 +330,7 @@ static void ecc_class_init(ObjectClass *klass, void *= data) } =20 static const TypeInfo ecc_info =3D { - .name =3D "eccmemctl", + .name =3D TYPE_ECC_MEMCTL, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(ECCState), .class_init =3D ecc_class_init, --=20 1.8.1.4