diff options
author | Max Reitz <mreitz@redhat.com> | 2013-11-06 19:50:44 +0100 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2013-11-14 13:09:06 +0100 |
commit | 1452686495922b81d6cf43edf025c1aef15965c0 (patch) | |
tree | 46183b6590029d2c370bf1b1f80ec03de2363f9f | |
parent | 1296c2f0bc8283164c925bf587e497511de7f569 (diff) |
block/drive-mirror: Check for NULL backing_hd
It should be possible to execute the QMP "drive-mirror" command in
"none" sync mode and "absolute-paths" mode even for block devices
lacking a backing file.
"absolute-paths" does in fact not require a backing file to be present,
as can be seen from the "top" sync mode code path. "top" basically
states that the device should indeed have a backing file - however, the
current code catches the case if it doesn't and then simply treats it as
"full" sync mode, creating a target image without a backing file (in
"absolute-paths" mode). Thus, "absolute-paths" does not imply the target
file must indeed have a backing file.
Therefore, the target file may be left unbacked in case of "none" sync
mode as well, if the specified device is not backed either. Currently,
qemu will crash trying to dereference the backing file pointer since it
assumes that it will always be non-NULL in that case ("none" with
"absolute-paths").
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r-- | blockdev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/blockdev.c b/blockdev.c index 86e6bffdc4..d95569482a 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2029,7 +2029,9 @@ void qmp_drive_mirror(const char *device, const char *target, return; } - if (sync == MIRROR_SYNC_MODE_FULL && mode != NEW_IMAGE_MODE_EXISTING) { + if ((sync == MIRROR_SYNC_MODE_FULL || !source) + && mode != NEW_IMAGE_MODE_EXISTING) + { /* create new image w/o backing file */ assert(format && drv); bdrv_img_create(target, format, |