From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UtCPy-00063x-N5 for qemu-devel@nongnu.org; Sun, 30 Jun 2013 03:51:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UtCPx-0000Uj-92 for qemu-devel@nongnu.org; Sun, 30 Jun 2013 03:51:30 -0400 Received: from cantor2.suse.de ([195.135.220.15]:43221 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UtCPw-0000Uc-VQ for qemu-devel@nongnu.org; Sun, 30 Jun 2013 03:51:29 -0400 Message-ID: <51CFE37B.60104@suse.de> Date: Sun, 30 Jun 2013 09:51:23 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1db329c6367eda561174e161e202f85fea4eff36.1372055322.git.peter.crosthwaite@xilinx.com> In-Reply-To: <1db329c6367eda561174e161e202f85fea4eff36.1372055322.git.peter.crosthwaite@xilinx.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 05/30] scsi/lsi53c895a: QOM Upcast Sweep List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.crosthwaite@xilinx.com Cc: pbonzini@redhat.com, qemu-devel@nongnu.org, mst@redhat.com Am 24.06.2013 08:53, schrieb peter.crosthwaite@xilinx.com: > From: Peter Crosthwaite >=20 > Define and use standard QOM cast macro. Remove usages of DO_UPCAST > and direct -> style upcasting. >=20 > Signed-off-by: Peter Crosthwaite > --- >=20 > hw/scsi/lsi53c895a.c | 26 ++++++++++++++++---------- > 1 file changed, 16 insertions(+), 10 deletions(-) >=20 > diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c > index 22b8e98..d488c5c 100644 > --- a/hw/scsi/lsi53c895a.c > +++ b/hw/scsi/lsi53c895a.c > @@ -275,6 +275,11 @@ typedef struct { > uint32_t script_ram[2048]; > } LSIState; > =20 > +#define TYPE_LSI53C895A "lsi53c895a" > + > +#define LSI53C895A(obj) \ > + OBJECT_CHECK(LSIState, (obj), TYPE_LSI53C895A) > + > static inline int lsi_irq_on_rsl(LSIState *s) > { > return (s->sien0 & LSI_SIST0_RSL) && (s->scid & LSI_SCID_RRE); > @@ -653,7 +658,7 @@ static void lsi_request_free(LSIState *s, lsi_reque= st *p) > =20 > static void lsi_request_cancelled(SCSIRequest *req) > { > - LSIState *s =3D DO_UPCAST(LSIState, dev.qdev, req->bus->qbus.paren= t); > + LSIState *s =3D LSI53C895A(req->bus->qbus.parent); We should be using BUS() in place of ->qbus, but since you're pretty cleanly separating things in your series, we can do that as a follow-up. Thanks, queued on qom-next: https://github.com/afaerber/qemu-cpu/commits/qom-next Andreas > lsi_request *p =3D req->hba_private; > =20 > req->hba_private =3D NULL; > @@ -692,7 +697,7 @@ static int lsi_queue_req(LSIState *s, SCSIRequest *= req, uint32_t len) > /* Callback to indicate that the SCSI layer has completed a command. = */ > static void lsi_command_complete(SCSIRequest *req, uint32_t status, si= ze_t resid) > { > - LSIState *s =3D DO_UPCAST(LSIState, dev.qdev, req->bus->qbus.paren= t); > + LSIState *s =3D LSI53C895A(req->bus->qbus.parent); > int out; > =20 > out =3D (s->sstat1 & PHASE_MASK) =3D=3D PHASE_DO; > @@ -717,7 +722,7 @@ static void lsi_command_complete(SCSIRequest *req, = uint32_t status, size_t resid > /* Callback to indicate that the SCSI layer has completed a transfer.= */ > static void lsi_transfer_data(SCSIRequest *req, uint32_t len) > { > - LSIState *s =3D DO_UPCAST(LSIState, dev.qdev, req->bus->qbus.paren= t); > + LSIState *s =3D LSI53C895A(req->bus->qbus.parent); > int out; > =20 > assert(req->hba_private); > @@ -1726,7 +1731,7 @@ static void lsi_reg_writeb(LSIState *s, int offse= t, uint8_t val) > lsi_execute_script(s); > } > if (val & LSI_ISTAT0_SRST) { > - qdev_reset_all(&s->dev.qdev); > + qdev_reset_all(DEVICE(s)); > } > break; > case 0x16: /* MBOX0 */ > @@ -1960,7 +1965,7 @@ static const MemoryRegionOps lsi_io_ops =3D { > =20 > static void lsi_scsi_reset(DeviceState *dev) > { > - LSIState *s =3D DO_UPCAST(LSIState, dev.qdev, dev); > + LSIState *s =3D LSI53C895A(dev); > =20 > lsi_soft_reset(s); > } > @@ -2061,7 +2066,7 @@ static const VMStateDescription vmstate_lsi_scsi = =3D { > =20 > static void lsi_scsi_uninit(PCIDevice *d) > { > - LSIState *s =3D DO_UPCAST(LSIState, dev, d); > + LSIState *s =3D LSI53C895A(d); > =20 > memory_region_destroy(&s->mmio_io); > memory_region_destroy(&s->ram_io); > @@ -2080,7 +2085,8 @@ static const struct SCSIBusInfo lsi_scsi_info =3D= { > =20 > static int lsi_scsi_init(PCIDevice *dev) > { > - LSIState *s =3D DO_UPCAST(LSIState, dev, dev); > + LSIState *s =3D LSI53C895A(dev); > + DeviceState *d =3D DEVICE(dev); > uint8_t *pci_conf; > =20 > pci_conf =3D s->dev.config; > @@ -2099,8 +2105,8 @@ static int lsi_scsi_init(PCIDevice *dev) > pci_register_bar(&s->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->ra= m_io); > QTAILQ_INIT(&s->queue); > =20 > - scsi_bus_new(&s->bus, &dev->qdev, &lsi_scsi_info, NULL); > - if (!dev->qdev.hotplugged) { > + scsi_bus_new(&s->bus, d, &lsi_scsi_info, NULL); > + if (!d->hotplugged) { > return scsi_bus_legacy_handle_cmdline(&s->bus); > } > return 0; > @@ -2122,7 +2128,7 @@ static void lsi_class_init(ObjectClass *klass, vo= id *data) > } > =20 > static const TypeInfo lsi_info =3D { > - .name =3D "lsi53c895a", > + .name =3D TYPE_LSI53C895A, > .parent =3D TYPE_PCI_DEVICE, > .instance_size =3D sizeof(LSIState), > .class_init =3D lsi_class_init, >=20 --=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