From: Stefan Hajnoczi <[email protected]> SG_IO supports an unsigned int dxfer_len value. Existing callers use less than 256 bytes, so scsi_SG_IO()'s uint8_t buf_size type was sufficient. The next patch will use a larger value, so update the type.
Signed-off-by: Stefan Hajnoczi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Paolo Bonzini <[email protected]> --- include/hw/scsi/scsi.h | 3 ++- hw/scsi/scsi-generic.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index a3e246dbd92..5f83e58d1d0 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -247,7 +247,8 @@ void scsi_device_unit_attention_reported(SCSIDevice *dev); void scsi_generic_read_device_inquiry(SCSIDevice *dev); int scsi_device_get_sense(SCSIDevice *dev, uint8_t *buf, int len, bool fixed); int scsi_SG_IO(BlockBackend *blk, int direction, uint8_t *cmd, uint8_t cmd_size, - uint8_t *buf, uint8_t buf_size, uint32_t timeout, Error **errp); + uint8_t *buf, unsigned int buf_size, uint32_t timeout, + Error **errp); SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int target, int lun); SCSIDevice *scsi_device_get(SCSIBus *bus, int channel, int target, int lun); diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index a2316a5266e..e629b1756b0 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -774,7 +774,7 @@ static int read_naa_id(const uint8_t *p, uint64_t *p_wwn) } int scsi_SG_IO(BlockBackend *blk, int direction, uint8_t *cmd, - uint8_t cmd_size, uint8_t *buf, uint8_t buf_size, + uint8_t cmd_size, uint8_t *buf, unsigned int buf_size, uint32_t timeout, Error **errp) { sg_io_hdr_t io_header; -- 2.54.0
