From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60208) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmLLS-0005lI-BZ for qemu-devel@nongnu.org; Tue, 11 Jun 2013 05:58:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UmLLN-0005yc-5u for qemu-devel@nongnu.org; Tue, 11 Jun 2013 05:58:30 -0400 Received: from cantor2.suse.de ([195.135.220.15]:39241 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmLLM-0005yU-SH for qemu-devel@nongnu.org; Tue, 11 Jun 2013 05:58:25 -0400 Message-ID: <51B6F4BD.6020105@suse.de> Date: Tue, 11 Jun 2013 11:58:21 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [RFT PATCH v1 16/30] isa/*: QOM casting sweep List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.crosthwaite@xilinx.com Cc: pbonzini@redhat.com, aliguori@us.ibm.com, qemu-devel@nongnu.org Am 11.06.2013 08:52, schrieb peter.crosthwaite@xilinx.com: > From: Peter Crosthwaite >=20 > Use standard QOM cast macros. Remove usage of DO_UPCAST and > direct -> style upcasting. >=20 > Signed-off-by: Peter Crosthwaite > --- >=20 > hw/isa/i82378.c | 8 ++++---- > hw/isa/lpc_ich9.c | 6 +++--- > hw/isa/piix4.c | 4 ++-- > hw/isa/vt82c686.c | 14 +++++++------- > 4 files changed, 16 insertions(+), 16 deletions(-) [...] > diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c > index d750413..1eb05b2 100644 > --- a/hw/isa/piix4.c > +++ b/hw/isa/piix4.c [...] > @@ -98,7 +98,7 @@ int piix4_init(PCIBus *bus, ISABus **isa_bus, int dev= fn) > PCIDevice *d; > =20 > d =3D pci_create_simple_multifunction(bus, devfn, true, "PIIX4"); > - *isa_bus =3D DO_UPCAST(ISABus, qbus, qdev_get_child_bus(&d->qdev, = "isa.0")); > + *isa_bus =3D DO_UPCAST(ISABus, qbus, qdev_get_child_bus(DEVICE(d),= "isa.0")); Conflict, my ISABus patch does ISA_BUS() in addition: http://patchwork.ozlabs.org/patch/249705/ > return d->devfn; > } > =20 > diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c > index 5261927..8ec0d84 100644 > --- a/hw/isa/vt82c686.c > +++ b/hw/isa/vt82c686.c [...] > @@ -450,7 +450,7 @@ ISABus *vt82c686b_init(PCIBus *bus, int devfn) > =20 > d =3D pci_create_simple_multifunction(bus, devfn, true, "VT82C686B= "); > =20 > - return DO_UPCAST(ISABus, qbus, qdev_get_child_bus(&d->qdev, "isa.0= ")); > + return DO_UPCAST(ISABus, qbus, qdev_get_child_bus(DEVICE(d), "isa.= 0")); Ditto. > } > =20 > static void via_class_init(ObjectClass *klass, void *data) Otherwise looks fine. Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg