1 files changed, 1 insertions, 3 deletions
diff --git a/block.c b/block.c
index d50b08c29b..501b64c819 100644
--- a/block.c
+++ b/block.c
@@ -3362,9 +3362,7 @@ static void bdrv_close(BlockDriverState *bs)
 
 void bdrv_close_all(void)
 {
-    /* TODO We do want to cancel all jobs instead of just block jobs on
-     * shutdown, but bdrv_close_all() isn't the right place any more. */
-    job_cancel_sync_all();
+    assert(job_next(NULL) == NULL);
     nbd_export_close_all();
 
     /* Drop references from requests still in flight, such as canceled block