haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

virtio-scsi: clean out duplicate cdb field

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

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2015-03-11 14:35:47 +01:00
parent 03325525c3
commit bb72463bc8
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hw/scsi/virtio-scsi.c
View file

@ -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, req->sreq = scsi_req_new(d, req->req.cmd.tag,
virtio_scsi_get_lun(req->req.cmd.lun), 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 if (req->sreq->cmd.mode != SCSI_XFER_NONE
&& (req->sreq->cmd.mode != req->mode || && (req->sreq->cmd.mode != req->mode ||

7
include/hw/virtio/virtio-scsi.h
View file

@ -109,8 +109,7 @@ typedef struct VirtIOSCSIReq {
/* Note: /* Note:
* - fields before elem are initialized by virtio_scsi_init_req; * - fields before elem are initialized by virtio_scsi_init_req;
* - elem is uninitialized at the time of allocation. * - elem is uninitialized at the time of allocation.
* - fields after elem (except the ending cdb[]) are zeroed by * - fields after elem are zeroed by virtio_scsi_init_req.
* virtio_scsi_init_req.
* */ * */
VirtQueueElement elem; VirtQueueElement elem;
@ -137,16 +136,12 @@ typedef struct VirtIOSCSIReq {
union { union {
struct { struct {
VirtIOSCSICmdReq cmd; VirtIOSCSICmdReq cmd;
uint8_t cdb[];
} QEMU_PACKED; } QEMU_PACKED;
VirtIOSCSICtrlTMFReq tmf; VirtIOSCSICtrlTMFReq tmf;
VirtIOSCSICtrlANReq an; VirtIOSCSICtrlANReq an;
} req; } req;
} VirtIOSCSIReq; } VirtIOSCSIReq;
QEMU_BUILD_BUG_ON(offsetof(VirtIOSCSIReq, req.cdb) !=
offsetof(VirtIOSCSIReq, req.cmd) + sizeof(VirtIOSCSICmdReq));
#define DEFINE_VIRTIO_SCSI_PROPERTIES(_state, _conf_field) \ #define DEFINE_VIRTIO_SCSI_PROPERTIES(_state, _conf_field) \
DEFINE_PROP_UINT32("num_queues", _state, _conf_field.num_queues, 1), \ DEFINE_PROP_UINT32("num_queues", _state, _conf_field.num_queues, 1), \
DEFINE_PROP_UINT32("max_sectors", _state, _conf_field.max_sectors, 0xFFFF),\ DEFINE_PROP_UINT32("max_sectors", _state, _conf_field.max_sectors, 0xFFFF),\