[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/7] esp: use hba_private field instead of a complex
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH 4/7] esp: use hba_private field instead of a complex cast |
Date: |
Sun, 3 Jun 2012 12:38:06 +0200 |
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/esp.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/esp.c b/hw/esp.c
index 9a57938..1b5403c 100644
--- a/hw/esp.c
+++ b/hw/esp.c
@@ -186,7 +186,7 @@ static void esp_dma_enable(void *opaque, int irq, int level)
static void esp_request_cancelled(SCSIRequest *req)
{
- ESPState *s = DO_UPCAST(ESPState, busdev.qdev, req->bus->qbus.parent);
+ ESPState *s = req->hba_private;
if (req == s->current_req) {
scsi_req_unref(s->current_req);
@@ -242,7 +242,7 @@ static void do_busid_cmd(ESPState *s, uint8_t *buf, uint8_t
busid)
trace_esp_do_busid_cmd(busid);
lun = busid & 7;
current_lun = scsi_device_find(&s->bus, 0, s->current_dev->id, lun);
- s->current_req = scsi_req_new(current_lun, 0, lun, buf, NULL);
+ s->current_req = scsi_req_new(current_lun, 0, lun, buf, s);
datalen = scsi_req_enqueue(s->current_req);
s->ti_size = datalen;
if (datalen != 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 = DO_UPCAST(ESPState, busdev.qdev, req->bus->qbus.parent);
+ ESPState *s = req->hba_private;
trace_esp_command_complete();
if (s->ti_size != 0) {
@@ -420,7 +420,7 @@ static void esp_command_complete(SCSIRequest *req, uint32_t
status,
static void esp_transfer_data(SCSIRequest *req, uint32_t len)
{
- ESPState *s = DO_UPCAST(ESPState, busdev.qdev, req->bus->qbus.parent);
+ ESPState *s = req->hba_private;
trace_esp_transfer_data(s->dma_left, s->ti_size);
s->async_len = len;
--
1.7.10
- [Qemu-devel] [PATCH 0/7] esp: add AMD PCscsi emulation, Hervé Poussineau, 2012/06/03
- [Qemu-devel] [PATCH 1/7] esp: implement Disable selection command, Hervé Poussineau, 2012/06/03
- [Qemu-devel] [PATCH 3/7] esp: support future change of chip_id, Hervé Poussineau, 2012/06/03
- [Qemu-devel] [PATCH 2/7] esp: implement Reset ATN command, Hervé Poussineau, 2012/06/03
- [Qemu-devel] [PATCH 4/7] esp: use hba_private field instead of a complex cast,
Hervé Poussineau <=
- [Qemu-devel] [PATCH 5/7] esp: split esp code into generic chip emulation and sysbus layer, Hervé Poussineau, 2012/06/03
- [Qemu-devel] [PATCH 6/7] esp: use error_report()/hw_error() instead of stderr output, Hervé Poussineau, 2012/06/03
- [Qemu-devel] [PATCH 7/7] esp: add AMD PCscsi emulation (PCI SCSI adapter), Hervé Poussineau, 2012/06/03