[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/7] block: fail live snapshot if disk has no medium
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 2/7] block: fail live snapshot if disk has no medium |
Date: |
Thu, 5 Apr 2012 17:42:56 +0200 |
This would cause a segfault accessing states->old_bs->drv.
Signed-off-by: Paolo Bonzini <address@hidden>
---
blockdev.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 4d17486..be9cdc5 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -752,14 +752,17 @@ void qmp_transaction(BlockdevActionList *dev_list, Error
**errp)
goto delete_and_fail;
}
+ if (!bdrv_is_inserted(states->old_bs)) {
+ error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device);
+ goto delete_and_fail;
+ }
+
if (bdrv_in_use(states->old_bs)) {
error_set(errp, QERR_DEVICE_IN_USE, device);
goto delete_and_fail;
}
- if (!bdrv_is_read_only(states->old_bs) &&
- bdrv_is_inserted(states->old_bs)) {
-
+ if (!bdrv_is_read_only(states->old_bs)) {
if (bdrv_flush(states->old_bs)) {
error_set(errp, QERR_IO_ERROR);
goto delete_and_fail;
--
1.7.9.3
- [Qemu-devel] [PATCH 0/7] Miscellaneous fixes for block and snapshots, Paolo Bonzini, 2012/04/05
- [Qemu-devel] [PATCH 1/7] block: add mode argument to blockdev-snapshot-sync, Paolo Bonzini, 2012/04/05
- [Qemu-devel] [PATCH 2/7] block: fail live snapshot if disk has no medium,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 3/7] block: fix snapshot with QED format, Paolo Bonzini, 2012/04/05
- [Qemu-devel] [PATCH 4/7] block: close unused image files at the end of streaming, Paolo Bonzini, 2012/04/05
- [Qemu-devel] [PATCH 5/7] block: pass new base image format to bdrv_change_backing_file, Paolo Bonzini, 2012/04/05
- [Qemu-devel] [PATCH 7/7] block: update in-memory backing file and format, Paolo Bonzini, 2012/04/05
- [Qemu-devel] [PATCH 6/7] block: push bdrv_change_backing_file error checking up from drivers, Paolo Bonzini, 2012/04/05
- Re: [Qemu-devel] [PATCH 0/7] Miscellaneous fixes for block and snapshots, Paolo Bonzini, 2012/04/12