diff options
Diffstat (limited to 'hw/scsi-bus.c')
| -rw-r--r-- | hw/scsi-bus.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 559d5a4708..6f0d03958d 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -292,7 +292,8 @@ static int32_t scsi_target_send_command(SCSIRequest *req, uint8_t *buf) if (req->cmd.xfer < 4) { goto illegal_request; } - r->len = scsi_device_get_sense(r->req.dev, r->buf, req->cmd.xfer, + r->len = scsi_device_get_sense(r->req.dev, r->buf, + MIN(req->cmd.xfer, sizeof r->buf), (req->cmd.buf[1] & 1) == 0); break; default: @@ -345,7 +346,7 @@ SCSIRequest *scsi_req_alloc(SCSIReqOps *reqops, SCSIDevice *d, uint32_t tag, { SCSIRequest *req; - req = qemu_mallocz(reqops->size); + req = g_malloc0(reqops->size); req->refcount = 1; req->bus = scsi_bus_from_device(d); req->dev = d; @@ -1014,7 +1015,7 @@ void scsi_req_unref(SCSIRequest *req) if (req->ops->free_req) { req->ops->free_req(req); } - qemu_free(req); + g_free(req); } } |