From 9a743e5ba32f7a620baa0b3d3808e88d2433e861 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Mon, 30 Nov 2009 18:21:21 +0100 Subject: [PATCH] ram migration: Stop loading on error Besides catching real errors, this also allows to interrrupt the qemu process during restore. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori --- vl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vl.c b/vl.c index ba5bd3d80e..62427b8f97 100644 --- a/vl.c +++ b/vl.c @@ -3016,8 +3016,12 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) madvise(qemu_get_ram_ptr(addr), TARGET_PAGE_SIZE, MADV_DONTNEED); } #endif - } else if (flags & RAM_SAVE_FLAG_PAGE) + } else if (flags & RAM_SAVE_FLAG_PAGE) { qemu_get_buffer(f, qemu_get_ram_ptr(addr), TARGET_PAGE_SIZE); + } + if (qemu_file_has_error(f)) { + return -EIO; + } } while (!(flags & RAM_SAVE_FLAG_EOS)); return 0; -- 2.30.2