diff options
| author | Anthony Liguori | 2013-01-15 23:52:56 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2013-01-15 23:52:56 +0100 |
| commit | b9f84ac0fa81315bf4efa8db64f0705273b7499a (patch) | |
| tree | 23e52b0dceb04a1dbd53432b5276005ed221f87a /hw/scsi-disk.c | |
| parent | Merge remote-tracking branch 'afaerber/qom-cpu' into staging (diff) | |
| parent | block: Fix how mirror_run() frees its buffer (diff) | |
| download | qemu-b9f84ac0fa81315bf4efa8db64f0705273b7499a.tar.gz qemu-b9f84ac0fa81315bf4efa8db64f0705273b7499a.tar.xz qemu-b9f84ac0fa81315bf4efa8db64f0705273b7499a.zip | |
Merge remote-tracking branch 'stefanha/block' into staging
* stefanha/block:
block: Fix how mirror_run() frees its buffer
win32-aio: Fix how win32_aio_process_completion() frees buffer
scsi-disk: qemu_vfree(NULL) is fine, simplify
w32: Make qemu_vfree() accept NULL like the POSIX implementation
sheepdog: clean up sd_aio_setup()
sheepdog: multiplex the rw FD to flush cache
block: clear dirty bitmap when discarding
ide: issue discard asynchronously but serialize the pieces
ide: fix TRIM with empty range entry
block: make discard asynchronous
raw: support discard on block devices
raw-posix: remember whether discard failed
raw-posix: support discard on more filesystems
block: fix initialization in bdrv_io_limits_enable()
qcow2: Fix segfault on zero-length write
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/scsi-disk.c')
| -rw-r--r-- | hw/scsi-disk.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index f8d7ef3374..96db9a73c7 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -85,9 +85,7 @@ static void scsi_free_request(SCSIRequest *req) { SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req); - if (r->iov.iov_base) { - qemu_vfree(r->iov.iov_base); - } + qemu_vfree(r->iov.iov_base); } /* Helper function for command completion with sense. */ |