From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:59830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqQHJ-0007Gb-IJ for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:26:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RqQHD-0001f9-HM for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:26:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:8033) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqQHD-0001ev-6N for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:26:11 -0500 From: Orit Wasserman Date: Thu, 26 Jan 2012 16:24:50 +0200 Message-Id: <1327587897-31192-5-git-send-email-owasserm@redhat.com> In-Reply-To: <1327587897-31192-1-git-send-email-owasserm@redhat.com> References: <1327587897-31192-1-git-send-email-owasserm@redhat.com> Subject: [Qemu-devel] [PATCH v7 04/11] Add host_from_stream_offset_versioned function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, stefanha@gmail.com, Orit Wasserman , avi@redhat.com, quintela@redhat.com Signed-off-by: Orit Wasserman --- arch_init.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/arch_init.c b/arch_init.c index ac21bc0..0f6037e 100644 --- a/arch_init.c +++ b/arch_init.c @@ -550,6 +550,18 @@ static inline void *host_from_stream_offset(QEMUFile *f, return NULL; } +static inline void *host_from_stream_offset_versioned(int version_id, + QEMUFile *f, ram_addr_t offset, int flags) +{ + void *host; + if (version_id == 3) { + host = qemu_get_ram_ptr(offset); + } else { + host = host_from_stream_offset(f, offset, flags); + } + return host; +} + int ram_load(QEMUFile *f, void *opaque, int version_id) { ram_addr_t addr; @@ -605,8 +617,11 @@ int ram_load(QEMUFile *f, void *opaque, int version_id) void *host; uint8_t ch; - host = host_from_stream_offset(f, addr, flags); + host = host_from_stream_offset_versioned(version_id, + f, addr, flags); if (!host) { + fprintf(stderr, "Failed to convert RAM address to host" + " for offset " RAM_ADDR_FMT "\n", addr); return -EINVAL; } @@ -621,8 +636,13 @@ int ram_load(QEMUFile *f, void *opaque, int version_id) } else if (flags & RAM_SAVE_FLAG_PAGE) { void *host; - host = host_from_stream_offset(f, addr, flags); - + host = host_from_stream_offset_versioned(version_id, + f, addr, flags); + if (!host) { + fprintf(stderr, "Failed to convert RAM address to host" + " for offset " RAM_ADDR_FMT "\n", addr); + return -EINVAL; + } qemu_get_buffer(f, host, TARGET_PAGE_SIZE); } error = qemu_file_get_error(f); -- 1.7.6.5