From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoAnp-0002ET-Su for qemu-devel@nongnu.org; Mon, 09 Jul 2012 06:02:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SoAnj-0006xa-Ge for qemu-devel@nongnu.org; Mon, 09 Jul 2012 06:02:49 -0400 Received: from smtp1-g21.free.fr ([212.27.42.1]:57364) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoAni-0006x9-TZ for qemu-devel@nongnu.org; Mon, 09 Jul 2012 06:02:43 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 9 Jul 2012 12:02:27 +0200 Message-Id: <1341828152-15199-7-git-send-email-hpoussin@reactos.org> In-Reply-To: <1341828152-15199-1-git-send-email-hpoussin@reactos.org> References: <1341828152-15199-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 06/10] esp: use hba_private field instead of a complex cast List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Kevin Wolf Signed-off-by: Herv=C3=A9 Poussineau --- hw/esp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/esp.c b/hw/esp.c index a1f5b8a..d9dd2aa 100644 --- a/hw/esp.c +++ b/hw/esp.c @@ -186,7 +186,7 @@ static void esp_dma_enable(void *opaque, int irq, int= level) =20 static void esp_request_cancelled(SCSIRequest *req) { - ESPState *s =3D DO_UPCAST(ESPState, busdev.qdev, req->bus->qbus.pare= nt); + ESPState *s =3D req->hba_private; =20 if (req =3D=3D s->current_req) { scsi_req_unref(s->current_req); @@ -242,7 +242,7 @@ static void do_busid_cmd(ESPState *s, uint8_t *buf, u= int8_t busid) trace_esp_do_busid_cmd(busid); lun =3D busid & 7; current_lun =3D scsi_device_find(&s->bus, 0, s->current_dev->id, lun= ); - s->current_req =3D scsi_req_new(current_lun, 0, lun, buf, NULL); + s->current_req =3D scsi_req_new(current_lun, 0, lun, buf, s); datalen =3D scsi_req_enqueue(s->current_req); s->ti_size =3D datalen; if (datalen !=3D 0) { @@ -396,7 +396,7 @@ static void esp_do_dma(ESPState *s) static void esp_command_complete(SCSIRequest *req, uint32_t status, size_t resid) { - ESPState *s =3D DO_UPCAST(ESPState, busdev.qdev, req->bus->qbus.pare= nt); + ESPState *s =3D req->hba_private; =20 trace_esp_command_complete(); if (s->ti_size !=3D 0) { @@ -420,7 +420,7 @@ static void esp_command_complete(SCSIRequest *req, ui= nt32_t status, =20 static void esp_transfer_data(SCSIRequest *req, uint32_t len) { - ESPState *s =3D DO_UPCAST(ESPState, busdev.qdev, req->bus->qbus.pare= nt); + ESPState *s =3D req->hba_private; =20 trace_esp_transfer_data(s->dma_left, s->ti_size); s->async_len =3D len; --=20 1.7.10.4