Commit bb72463b authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

virtio-scsi: clean out duplicate cdb field 



cdb is now part of cmd, drop it from req.
There's also nothing to check using build assert now.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 03325525

hw/scsi/virtio-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ bool virtio_scsi_handle_cmd_req_prepare(VirtIOSCSI *s, VirtIOSCSIReq *req) 
    }

    req->sreq = scsi_req_new(d, req->req.cmd.tag,

                             virtio_scsi_get_lun(req->req.cmd.lun),

                             req->req.cdb, req);

                             req->req.cmd.cdb, req);



    if (req->sreq->cmd.mode != SCSI_XFER_NONE

        && (req->sreq->cmd.mode != req->mode ||

include/hw/virtio/virtio-scsi.h

+1 −6
Original line number Diff line number Diff line
@@ -109,8 +109,7 @@ typedef struct VirtIOSCSIReq { 
    /* Note:

     * - fields before elem are initialized by virtio_scsi_init_req;

     * - elem is uninitialized at the time of allocation.

     * - fields after elem (except the ending cdb[]) are zeroed by

     *   virtio_scsi_init_req.

     * - fields after elem are zeroed by virtio_scsi_init_req.

     * */



    VirtQueueElement elem;
@@ -137,16 +136,12 @@ typedef struct VirtIOSCSIReq { 
    union {

        struct {

            VirtIOSCSICmdReq  cmd;

            uint8_t           cdb[];

        } QEMU_PACKED;

        VirtIOSCSICtrlTMFReq  tmf;

        VirtIOSCSICtrlANReq   an;

    } req;

} VirtIOSCSIReq;



QEMU_BUILD_BUG_ON(offsetof(VirtIOSCSIReq, req.cdb) !=

                  offsetof(VirtIOSCSIReq, req.cmd) + sizeof(VirtIOSCSICmdReq));



#define DEFINE_VIRTIO_SCSI_PROPERTIES(_state, _conf_field)                     \

    DEFINE_PROP_UINT32("num_queues", _state, _conf_field.num_queues, 1),       \

    DEFINE_PROP_UINT32("max_sectors", _state, _conf_field.max_sectors, 0xFFFF),\