diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2011-10-12 12:58:31 +0200 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2011-10-28 19:25:52 +0200 |
commit | 63db0f0eee3c0b2cc3a06b36daf50c4e7801ea1b (patch) | |
tree | 6472059e8edd009d8ae69fc2752018108adfb42d | |
parent | 765d1525a6c727674c5f6f459da4fdaeeda91162 (diff) | |
download | qemu-63db0f0eee3c0b2cc3a06b36daf50c4e7801ea1b.zip qemu-63db0f0eee3c0b2cc3a06b36daf50c4e7801ea1b.tar.gz qemu-63db0f0eee3c0b2cc3a06b36daf50c4e7801ea1b.tar.bz2 |
scsi: pass cdb to alloc_req
This will let scsi-block choose between passthrough and emulation.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r-- | hw/scsi-bus.c | 2 | ||||
-rw-r--r-- | hw/scsi-disk.c | 4 | ||||
-rw-r--r-- | hw/scsi-generic.c | 2 | ||||
-rw-r--r-- | 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; @@ -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); }; |