diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-01-23 18:25:30 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-01-23 18:25:30 +0000 |
| commit | d109f80af3ad5c64c8c30e7ab21f2e342b5e9a8d (patch) | |
| tree | f0a649b3d92e256ee83eee82bf8bc47f24166cfc /block/mirror.c | |
| parent | a46b3aaf6bb038d4f6f192a84df204f10929e75c (diff) | |
| parent | bc63781ca350cad4c9eb142ce8f55bfaded4276e (diff) | |
| download | qemu-d109f80af3ad5c64c8c30e7ab21f2e342b5e9a8d.zip qemu-d109f80af3ad5c64c8c30e7ab21f2e342b5e9a8d.tar.gz qemu-d109f80af3ad5c64c8c30e7ab21f2e342b5e9a8d.tar.bz2 | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches for 2.3
# gpg: Signature made Fri 23 Jan 2015 17:53:06 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
iotests: Lower 064's memory usage
block: vhdx - force FileOffsetMB field to '0' for certain block states
block: update string sizes for filename,backing_file,exact_filename
block: mirror - change string allocation to 2-bytes
block: remove unused variable in bdrv_commit
block: qapi - move string allocation from stack to the heap
block: vmdk - move string allocations from stack to the heap
block: vmdk - make ret variable usage clear
iotests: Add tests for more corruption cases
qcow2: Add two more unalignment checks
virtio-blk: Use blk_aio_ioctl
virtio-blk: Pass req to virtio_blk_handle_scsi_req
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/mirror.c')
| -rw-r--r-- | block/mirror.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/mirror.c b/block/mirror.c index 9019d1b..4056164 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -378,7 +378,8 @@ static void coroutine_fn mirror_run(void *opaque) int64_t sector_num, end, sectors_per_chunk, length; uint64_t last_pause_ns; BlockDriverInfo bdi; - char backing_filename[1024]; + char backing_filename[2]; /* we only need 2 characters because we are only + checking for a NULL string */ int ret = 0; int n; |