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 /qemu-img.c | |
| parent | a46b3aaf6bb038d4f6f192a84df204f10929e75c (diff) | |
| parent | bc63781ca350cad4c9eb142ce8f55bfaded4276e (diff) | |
| download | focaccia-qemu-d109f80af3ad5c64c8c30e7ab21f2e342b5e9a8d.tar.gz focaccia-qemu-d109f80af3ad5c64c8c30e7ab21f2e342b5e9a8d.zip | |
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 'qemu-img.c')
| -rw-r--r-- | qemu-img.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu-img.c b/qemu-img.c index 7876258fa9..4e9a7f5741 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2556,7 +2556,7 @@ static int img_rebase(int argc, char **argv) /* For safe rebasing we need to compare old and new backing file */ if (!unsafe) { - char backing_name[1024]; + char backing_name[PATH_MAX]; blk_old_backing = blk_new_with_bs("old_backing", &error_abort); bs_old_backing = blk_bs(blk_old_backing); @@ -2614,7 +2614,7 @@ static int img_rebase(int argc, char **argv) } old_backing_num_sectors = bdrv_nb_sectors(bs_old_backing); if (old_backing_num_sectors < 0) { - char backing_name[1024]; + char backing_name[PATH_MAX]; bdrv_get_backing_filename(bs, backing_name, sizeof(backing_name)); error_report("Could not get size of '%s': %s", |