diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2011-08-03 10:49:09 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-12 08:27:37 -0500 |
| commit | 12010e7b29a2e777153440ded6fd5bd426eed3e4 (patch) | |
| tree | fb1cb1307998769551af79748d601dd27635ba5e /hw/scsi-generic.c | |
| parent | 8dbd4574882cade8261c2b6225df68a65345c75c (diff) | |
| download | focaccia-qemu-12010e7b29a2e777153440ded6fd5bd426eed3e4.tar.gz focaccia-qemu-12010e7b29a2e777153440ded6fd5bd426eed3e4.zip | |
scsi: move request-related callbacks from SCSIDeviceInfo to SCSIReqOps
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/scsi-generic.c')
| -rw-r--r-- | hw/scsi-generic.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 80d1601039..c2bd399956 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -491,6 +491,12 @@ static int scsi_generic_initfn(SCSIDevice *dev) static SCSIReqOps scsi_generic_req_ops = { .size = sizeof(SCSIGenericReq), + .free_req = scsi_free_request, + .send_command = scsi_send_command, + .read_data = scsi_read_data, + .write_data = scsi_write_data, + .cancel_io = scsi_cancel_io, + .get_buf = scsi_get_buf, }; static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun, @@ -510,12 +516,6 @@ static SCSIDeviceInfo scsi_generic_info = { .init = scsi_generic_initfn, .destroy = scsi_destroy, .alloc_req = scsi_new_request, - .free_req = scsi_free_request, - .send_command = scsi_send_command, - .read_data = scsi_read_data, - .write_data = scsi_write_data, - .cancel_io = scsi_cancel_io, - .get_buf = scsi_get_buf, .qdev.props = (Property[]) { DEFINE_BLOCK_PROPERTIES(SCSIGenericState, qdev.conf), DEFINE_PROP_END_OF_LIST(), |