Merge remote-tracking branch 'kwolf/for-anthony' into staging

This commit is contained in:
Anthony Liguori 2011-12-05 09:39:25 -06:00
commit eb5d5beaeb
40 changed files with 1333 additions and 347 deletions

View file

@ -2104,7 +2104,7 @@ int load_vmstate(const char *name)
}
/* Flush all IO requests so they don't interfere with the new state. */
qemu_aio_flush();
bdrv_drain_all();
bs = NULL;
while ((bs = bdrv_next(bs))) {