From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKruq-0005Zi-4b for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:28:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RKruo-0004Yl-SI for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:28:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33542) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKruo-0004Xu-IT for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:28:38 -0400 From: Kevin Wolf Date: Mon, 31 Oct 2011 14:30:25 +0100 Message-Id: <1320067830-12093-51-git-send-email-kwolf@redhat.com> In-Reply-To: <1320067830-12093-1-git-send-email-kwolf@redhat.com> References: <1320067830-12093-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 50/55] scsi: pass cdb to alloc_req List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini This will let scsi-block choose between passthrough and emulation. Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- hw/scsi-bus.c | 2 +- hw/scsi-disk.c | 4 ++-- hw/scsi-generic.c | 2 +- hw/scsi.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 1f38ac8..3cf571e 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -451,7 +451,7 @@ SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, uint32_t lun, req = scsi_req_alloc(&reqops_target_command, d, tag, lun, hba_private); } else { - req = d->info->alloc_req(d, tag, lun, hba_private); + req = d->info->alloc_req(d, tag, lun, buf, hba_private); } } diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 77673f2..415f81d 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1598,8 +1598,8 @@ static const SCSIReqOps scsi_disk_reqops = { .get_buf = scsi_get_buf, }; -static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, - uint32_t lun, void *hba_private) +static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun, + uint8_t *buf, void *hba_private) { SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, d); SCSIRequest *req; diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 32f50cd..2f95f2d 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -431,7 +431,7 @@ const SCSIReqOps scsi_generic_req_ops = { }; static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun, - void *hba_private) + uint8_t *buf, void *hba_private) { SCSIRequest *req; diff --git a/hw/scsi.h b/hw/scsi.h index 01c6655..8ea744a 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -94,7 +94,7 @@ struct SCSIDeviceInfo { scsi_qdev_initfn init; void (*destroy)(SCSIDevice *s); SCSIRequest *(*alloc_req)(SCSIDevice *s, uint32_t tag, uint32_t lun, - void *hba_private); + uint8_t *buf, void *hba_private); void (*unit_attention_reported)(SCSIDevice *s); }; -- 1.7.6.4