commit 3cbc002c34aa85ea952ee9b169a3ff97d350516a
author Paolo Bonzini <pbonzini@redhat.com> Fri Oct 19 11:36:48 2012 +0200
committer Paolo Bonzini <pbonzini@redhat.com> Tue Oct 23 22:39:32 2012 +0200
tree 315dcce972e74ad3e8bab06550c1cfbddf376943
parent 101f9cbc2b73340197ec610c095fd69f0b1413ed

block: prepare code for adding block notifiers

There is no reason in principle to skip job cancellation and draining
of pending I/O when there is no medium in the disk.  Do these unconditionally,
which also prepares the code for the next patch.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

block.c

diff --git a/block.c b/block.c
index e95f613..2e4ddea 100644
--- a/block.c
+++ b/block.c
@@ -1098,12 +1098,12 @@
 void bdrv_close(BlockDriverState *bs)
 {
     bdrv_flush(bs);
-    if (bs->drv) {
-        if (bs->job) {
-            block_job_cancel_sync(bs->job);
-        }
-        bdrv_drain_all();
+    if (bs->job) {
+        block_job_cancel_sync(bs->job);
+    }
+    bdrv_drain_all();
 
+    if (bs->drv) {
         if (bs == bs_snapshots) {
             bs_snapshots = NULL;
         }