diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2011-08-13 15:44:45 +0200 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2011-10-28 19:25:51 +0200 |
commit | afd4030c16d290e460cc93f8f9e353516b5451a2 (patch) | |
tree | 230de2da3d036bb6cdc28d940d826856bfdd1606 /hw/usb-msd.c | |
parent | 3c2f7c12c2e19707cb4e28dd57180f7be3dd4950 (diff) |
scsi: move tcq/ndev to SCSIBusOps (now SCSIBusInfo)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/usb-msd.c')
-rw-r--r-- | hw/usb-msd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/usb-msd.c b/hw/usb-msd.c index 08d2d2ac77..2c047fab39 100644 --- a/hw/usb-msd.c +++ b/hw/usb-msd.c @@ -495,7 +495,10 @@ static void usb_msd_password_cb(void *opaque, int err) qdev_unplug(&s->dev.qdev); } -static const struct SCSIBusOps usb_msd_scsi_ops = { +static const struct SCSIBusInfo usb_msd_scsi_info = { + .tcq = false, + .ndev = 1, + .transfer_data = usb_msd_transfer_data, .complete = usb_msd_command_complete, .cancel = usb_msd_request_cancelled @@ -536,7 +539,7 @@ static int usb_msd_initfn(USBDevice *dev) } usb_desc_init(dev); - scsi_bus_new(&s->bus, &s->dev.qdev, 0, 1, &usb_msd_scsi_ops); + scsi_bus_new(&s->bus, &s->dev.qdev, &usb_msd_scsi_info); s->scsi_dev = scsi_bus_legacy_add_drive(&s->bus, bs, 0, !!s->removable); if (!s->scsi_dev) { return -1; |