From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:34569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ri6On-0005fr-PL for qemu-devel@nongnu.org; Tue, 03 Jan 2012 10:35:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ri6Om-0006y9-Ml for qemu-devel@nongnu.org; Tue, 03 Jan 2012 10:35:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58595) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ri6Om-0006xz-GH for qemu-devel@nongnu.org; Tue, 03 Jan 2012 10:35:36 -0500 From: Orit Wasserman Date: Tue, 3 Jan 2012 17:34:34 +0200 Message-Id: <1325604879-15862-5-git-send-email-owasserm@redhat.com> In-Reply-To: <1325604879-15862-1-git-send-email-owasserm@redhat.com> References: <1325604879-15862-1-git-send-email-owasserm@redhat.com> Subject: [Qemu-devel] [PATCH v5 4/9] 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 , quintela@redhat.com Signed-off-by: Orit Wasserman --- arch_init.c | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/arch_init.c b/arch_init.c index e87dfbc..05b8053 100644 --- a/arch_init.c +++ b/arch_init.c @@ -613,6 +613,23 @@ 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); + } + if (!host) { + fprintf(stderr, "Failed to convert RAM address to host" + " for offset 0x%lX!\n", offset); + abort(); + } + return host; +} + int ram_load(QEMUFile *f, void *opaque, int version_id) { ram_addr_t addr; @@ -669,17 +686,10 @@ int ram_load(QEMUFile *f, void *opaque, int version_id) } if (flags & RAM_SAVE_FLAG_COMPRESS) { - void *host; uint8_t ch; - if (version_id == 3) - host = qemu_get_ram_ptr(addr); - else - host = host_from_stream_offset(f, addr, flags); - if (!host) { - return -EINVAL; - } - + host = host_from_stream_offset_versioned(version_id, + f, addr, flags); ch = qemu_get_byte(f); memset(host, ch, TARGET_PAGE_SIZE); #ifndef _WIN32 @@ -691,11 +701,8 @@ int ram_load(QEMUFile *f, void *opaque, int version_id) } else if (flags & RAM_SAVE_FLAG_PAGE) { void *host; - if (version_id == 3) - host = qemu_get_ram_ptr(addr); - else - host = host_from_stream_offset(f, addr, flags); - + host = host_from_stream_offset_versioned(version_id, + f, addr, flags); qemu_get_buffer(f, host, TARGET_PAGE_SIZE); } error = qemu_file_get_error(f); -- 1.7.6.5