From patchwork Mon Nov 30 17:21:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 39825 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 725FDB70B3 for ; Tue, 1 Dec 2009 04:52:11 +1100 (EST) Received: from localhost ([127.0.0.1]:39527 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFAPw-0000fJ-0x for incoming@patchwork.ozlabs.org; Mon, 30 Nov 2009 12:52:08 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFA2i-0003q6-Ow for qemu-devel@nongnu.org; Mon, 30 Nov 2009 12:28:08 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFA2a-0003j9-R8 for qemu-devel@nongnu.org; Mon, 30 Nov 2009 12:28:05 -0500 Received: from [199.232.76.173] (port=36090 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFA2Y-0003if-Fp for qemu-devel@nongnu.org; Mon, 30 Nov 2009 12:27:58 -0500 Received: from goliath.siemens.de ([192.35.17.28]:16749) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NFA2X-0004gC-AY for qemu-devel@nongnu.org; Mon, 30 Nov 2009 12:27:57 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id nAUHRpRe025357; Mon, 30 Nov 2009 18:27:51 +0100 Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged)) by mail1.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id nAUHRos1001980; Mon, 30 Nov 2009 18:27:50 +0100 Resent-From: Jan Kiszka Resent-To: Anthony Liguori Resent-Cc: qemu-devel , Liran Schour , Pierre Riteau Resent-Date: Mon, 30 Nov 2009 18:27:50 +0100 Resent-Message-Id: <4B140096.6030803@siemens.com> Resent-User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 From: Jan Kiszka To: Anthony Liguori Date: Mon, 30 Nov 2009 18:21:21 +0100 Message-ID: <20091130172121.22889.19699.stgit@mchn012c.ww002.siemens.net> In-Reply-To: <20091130172119.22889.28114.stgit@mchn012c.ww002.siemens.net> References: <20091130172119.22889.28114.stgit@mchn012c.ww002.siemens.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Resent-Date: Mon, 30 Nov 2009 12:28:05 -0500 Cc: qemu-devel@nongnu.org, Liran Schour , Pierre Riteau Subject: [Qemu-devel] [PATCH 16/23] ram migration: Stop loading on error X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Besides catching real errors, this also allows to interrrupt the qemu process during restore. Signed-off-by: Jan Kiszka --- vl.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/vl.c b/vl.c index ee43808..64426aa 100644 --- a/vl.c +++ b/vl.c @@ -3017,8 +3017,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;