From afd4030c16d290e460cc93f8f9e353516b5451a2 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Sat, 13 Aug 2011 15:44:45 +0200 Subject: scsi: move tcq/ndev to SCSIBusOps (now SCSIBusInfo) Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- hw/esp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'hw/esp.c') diff --git a/hw/esp.c b/hw/esp.c index 697c2c5..d3fb1c6 100644 --- a/hw/esp.c +++ b/hw/esp.c @@ -720,7 +720,10 @@ void esp_init(target_phys_addr_t espaddr, int it_shift, *dma_enable = qdev_get_gpio_in(dev, 1); } -static const struct SCSIBusOps esp_scsi_ops = { +static const struct SCSIBusInfo esp_scsi_info = { + .tcq = false, + .ndev = ESP_MAX_DEVS, + .transfer_data = esp_transfer_data, .complete = esp_command_complete, .cancel = esp_request_cancelled @@ -740,7 +743,7 @@ static int esp_init1(SysBusDevice *dev) qdev_init_gpio_in(&dev->qdev, esp_gpio_demux, 2); - scsi_bus_new(&s->bus, &dev->qdev, 0, ESP_MAX_DEVS, &esp_scsi_ops); + scsi_bus_new(&s->bus, &dev->qdev, &esp_scsi_info); return scsi_bus_legacy_handle_cmdline(&s->bus); } -- cgit v1.1