Commit afd4030c authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Kevin Wolf
Browse files

scsi: move tcq/ndev to SCSIBusOps (now SCSIBusInfo) 



Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 3c2f7c12

hw/esp.c

+5 −2
Original line number Diff line number Diff line
@@ -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);

}

hw/lsi53c895a.c

+6 −3
Original line number Diff line number Diff line
@@ -1686,7 +1686,7 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) 
                DeviceState *dev;

                int id;



                for (id = 0; id < s->bus.ndev; id++) {

                for (id = 0; id < LSI_MAX_DEVS; id++) {

                    if (s->bus.devs[id]) {

                        dev = &s->bus.devs[id]->qdev;

                        dev->info->reset(dev);
@@ -2091,7 +2091,10 @@ static int lsi_scsi_uninit(PCIDevice *d) 
    return 0;

}



static const struct SCSIBusOps lsi_scsi_ops = {

static const struct SCSIBusInfo lsi_scsi_info = {

    .tcq = true,

    .ndev = LSI_MAX_DEVS,



    .transfer_data = lsi_transfer_data,

    .complete = lsi_command_complete,

    .cancel = lsi_request_cancelled
@@ -2118,7 +2121,7 @@ static int lsi_scsi_init(PCIDevice *dev) 
    pci_register_bar(&s->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->ram_io);

    QTAILQ_INIT(&s->queue);



    scsi_bus_new(&s->bus, &dev->qdev, 1, LSI_MAX_DEVS, &lsi_scsi_ops);

    scsi_bus_new(&s->bus, &dev->qdev, &lsi_scsi_info);

    if (!dev->qdev.hotplugged) {

        return scsi_bus_legacy_handle_cmdline(&s->bus);

    }

hw/scsi-bus.c

+12 −15
Original line number Diff line number Diff line
@@ -24,14 +24,11 @@ static struct BusInfo scsi_bus_info = { 
static int next_scsi_bus;



/* Create a scsi bus, and attach devices to it.  */

void scsi_bus_new(SCSIBus *bus, DeviceState *host, int tcq, int ndev,

                  const SCSIBusOps *ops)

void scsi_bus_new(SCSIBus *bus, DeviceState *host, const SCSIBusInfo *info)

{

    qbus_create_inplace(&bus->qbus, &scsi_bus_info, host, NULL);

    bus->busnr = next_scsi_bus++;

    bus->tcq = tcq;

    bus->ndev = ndev;

    bus->ops = ops;

    bus->info = info;

    bus->qbus.allow_hotplug = 1;

}
@@ -43,12 +40,12 @@ static int scsi_qdev_init(DeviceState *qdev, DeviceInfo *base) 
    int rc = -1;



    if (dev->id == -1) {

        for (dev->id = 0; dev->id < bus->ndev; dev->id++) {

        for (dev->id = 0; dev->id < bus->info->ndev; dev->id++) {

            if (bus->devs[dev->id] == NULL)

                break;

        }

    }

    if (dev->id >= bus->ndev) {

    if (dev->id >= bus->info->ndev) {

        error_report("bad scsi device id: %d", dev->id);

        goto err;

    }
@@ -120,7 +117,7 @@ int scsi_bus_legacy_handle_cmdline(SCSIBus *bus) 
    int res = 0, unit;



    loc_push_none(&loc);

    for (unit = 0; unit < bus->ndev; unit++) {

    for (unit = 0; unit < bus->info->ndev; unit++) {

        dinfo = drive_get(IF_SCSI, bus->busnr, unit);

        if (dinfo == NULL) {

            continue;
@@ -265,7 +262,7 @@ static bool scsi_target_emulate_inquiry(SCSITargetReq *r) 
        r->buf[2] = 5; /* Version */

        r->buf[3] = 2 | 0x10; /* HiSup, response data format */

        r->buf[4] = r->len - 5; /* Additional Length = (Len - 1) - 4 */

        r->buf[7] = 0x10 | (r->req.bus->tcq ? 0x02 : 0); /* Sync, TCQ.  */

        r->buf[7] = 0x10 | (r->req.bus->info->tcq ? 0x02 : 0); /* Sync, TCQ.  */

        memcpy(&r->buf[8], "QEMU    ", 8);

        memcpy(&r->buf[16], "QEMU TARGET     ", 16);

        strncpy((char *) &r->buf[32], QEMU_VERSION, 4);
@@ -1062,7 +1059,7 @@ void scsi_req_continue(SCSIRequest *req) 
void scsi_req_data(SCSIRequest *req, int len)

{

    trace_scsi_req_data(req->dev->id, req->lun, req->tag, len);

    req->bus->ops->transfer_data(req, len);

    req->bus->info->transfer_data(req, len);

}



void scsi_req_print(SCSIRequest *req)
@@ -1121,7 +1118,7 @@ void scsi_req_complete(SCSIRequest *req, int status) 


    scsi_req_ref(req);

    scsi_req_dequeue(req);

    req->bus->ops->complete(req, req->status);

    req->bus->info->complete(req, req->status);

    scsi_req_unref(req);

}
@@ -1132,8 +1129,8 @@ void scsi_req_cancel(SCSIRequest *req) 
    }

    scsi_req_ref(req);

    scsi_req_dequeue(req);

    if (req->bus->ops->cancel) {

        req->bus->ops->cancel(req);

    if (req->bus->info->cancel) {

        req->bus->info->cancel(req);

    }

    scsi_req_unref(req);

}
@@ -1164,13 +1161,13 @@ static char *scsibus_get_fw_dev_path(DeviceState *dev) 
    char path[100];

    int i;



    for (i = 0; i < bus->ndev; i++) {

    for (i = 0; i < bus->info->ndev; i++) {

        if (bus->devs[i] == d) {

            break;

        }

    }



    assert(i != bus->ndev);

    assert(i != bus->info->ndev);



    snprintf(path, sizeof(path), "%s@%x", qdev_fw_name(dev), i);

hw/scsi-disk.c

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) 
    }



    /* Sync data transfer and TCQ.  */

    outbuf[7] = 0x10 | (req->bus->tcq ? 0x02 : 0);

    outbuf[7] = 0x10 | (req->bus->info->tcq ? 0x02 : 0);

    return buflen;

}

hw/scsi.h

+5 −6
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#define SCSI_CMD_BUF_SIZE     16



typedef struct SCSIBus SCSIBus;

typedef struct SCSIBusOps SCSIBusOps;

typedef struct SCSIBusInfo SCSIBusInfo;

typedef struct SCSICommand SCSICommand;

typedef struct SCSIDevice SCSIDevice;

typedef struct SCSIDeviceInfo SCSIDeviceInfo;
@@ -97,7 +97,8 @@ struct SCSIDeviceInfo { 
    SCSIReqOps reqops;

};



struct SCSIBusOps {

struct SCSIBusInfo {

    int tcq, ndev;

    void (*transfer_data)(SCSIRequest *req, uint32_t arg);

    void (*complete)(SCSIRequest *req, uint32_t arg);

    void (*cancel)(SCSIRequest *req);
@@ -108,14 +109,12 @@ struct SCSIBus { 
    int busnr;



    SCSISense unit_attention;

    int tcq, ndev;

    const SCSIBusOps *ops;

    const SCSIBusInfo *info;



    SCSIDevice *devs[MAX_SCSI_DEVS];

};



void scsi_bus_new(SCSIBus *bus, DeviceState *host, int tcq, int ndev,

                  const SCSIBusOps *ops);

void scsi_bus_new(SCSIBus *bus, DeviceState *host, const SCSIBusInfo *info);

void scsi_qdev_register(SCSIDeviceInfo *info);



static inline SCSIBus *scsi_bus_from_device(SCSIDevice *d)