aboutsummaryrefslogtreecommitdiff
path: root/hmp.c
diff options
context:
space:
mode:
authorAlberto Garcia <berto@igalia.com>2015-04-17 15:44:48 +0300
committerPeter Maydell <peter.maydell@linaro.org>2015-04-17 14:27:42 +0100
commit638b8366200130cc7cf7a026630bc6bfb63b0c4c (patch)
tree42cb5dfbdc4a1bf002f5ef883a3c73dfc655e2b4 /hmp.c
parent87a8adc0876c11a434d3ecdfb10cd797259ddaaa (diff)
downloadqemu-638b8366200130cc7cf7a026630bc6bfb63b0c4c.zip
qemu-638b8366200130cc7cf7a026630bc6bfb63b0c4c.tar.gz
qemu-638b8366200130cc7cf7a026630bc6bfb63b0c4c.tar.bz2
hmp: fix crash in 'info block -n -v'
The image field in BlockDeviceInfo should never be null, however bdrv_block_device_info() is not filling it in. This makes the 'info block -n -v' command crash QEMU. The proper solution is probably to move the relevant code from bdrv_query_info() to bdrv_block_device_info(), but since we're too close to the release for that this simpler workaround solves the crash. Signed-off-by: Alberto Garcia <berto@igalia.com> Message-id: 1429274688-8115-1-git-send-email-berto@igalia.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hmp.c')
-rw-r--r--hmp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hmp.c b/hmp.c
index f31ae27..f142d36 100644
--- a/hmp.c
+++ b/hmp.c
@@ -391,7 +391,8 @@ static void print_block_info(Monitor *mon, BlockInfo *info,
inserted->iops_size);
}
- if (verbose) {
+ /* TODO: inserted->image should never be null */
+ if (verbose && inserted->image) {
monitor_printf(mon, "\nImages:\n");
image_info = inserted->image;
while (1) {