]>
Commit | Line | Data |
---|---|---|
3c8a486f DM |
1 | do not use bdrv_drain_all() |
2 | ||
3 | This seems to hang now (qemu 2.2), causing timeouts. | |
4 | ||
5 | Index: new/blockdev.c | |
6 | =================================================================== | |
7 | --- new.orig/blockdev.c 2014-12-29 06:27:15.000000000 +0100 | |
8 | +++ new/blockdev.c 2014-12-29 07:11:53.000000000 +0100 | |
9 | @@ -2107,9 +2107,6 @@ | |
10 | vma_writer_set_error(backup_state.vmaw, "backup cancelled"); | |
11 | } | |
12 | ||
13 | - /* drain all i/o (awake jobs waiting for aio) */ | |
14 | - bdrv_drain_all(); | |
15 | - | |
16 | GList *l = backup_state.di_list; | |
17 | while (l) { | |
18 | PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data; | |
19 | @@ -2118,8 +2115,7 @@ | |
20 | BlockJob *job = di->bs->job; | |
21 | if (job) { | |
22 | if (!di->completed) { | |
23 | - block_job_cancel_sync(job); | |
24 | - bdrv_drain_all(); /* drain all i/o (awake jobs waiting for aio) */ | |
25 | + block_job_cancel_sync(job); | |
26 | } | |
27 | } | |
28 | } |