From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9CzI-0004aB-PE for qemu-devel@nongnu.org; Thu, 08 Jan 2015 08:18:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y9CzC-0005vD-Ja for qemu-devel@nongnu.org; Thu, 08 Jan 2015 08:18:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33430) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9CzC-0005v7-CY for qemu-devel@nongnu.org; Thu, 08 Jan 2015 08:18:50 -0500 Date: Thu, 8 Jan 2015 15:18:45 +0200 From: "Michael S. Tsirkin" Message-ID: <1420722790-17178-6-git-send-email-mst@redhat.com> References: <1420722790-17178-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1420722790-17178-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 5/7] arch_init: support resizing on incoming migration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Amit Shah , Peter Maydell , Paolo Bonzini , dgilbert@redhat.com, Juan Quintela If block used_length does not match, try to resize it. Signed-off-by: Michael S. Tsirkin Reviewed-by: Paolo Bonzini --- arch_init.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/arch_init.c b/arch_init.c index 106f46e..cfedbf0 100644 --- a/arch_init.c +++ b/arch_init.c @@ -1086,11 +1086,14 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) QTAILQ_FOREACH(block, &ram_list.blocks, next) { if (!strncmp(id, block->idstr, sizeof(id))) { - if (block->used_length != length) { - error_report("Length mismatch: %s: 0x" RAM_ADDR_FMT - " in != 0x" RAM_ADDR_FMT, id, length, - block->used_length); - ret = -EINVAL; + if (length != block->used_length) { + Error *local_err = NULL; + + ret = qemu_ram_resize(block->offset, length, &local_err); + if (local_err) { + error_report("%s", error_get_pretty(local_err)); + error_free(local_err); + } } break; } -- MST