From patchwork Tue Jan 3 13:35:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orit Wasserman X-Patchwork-Id: 134088 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 61982B6FA0 for ; Wed, 4 Jan 2012 08:24:31 +1100 (EST) Received: from localhost ([::1]:46893 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RiBqL-0000AF-Vp for incoming@patchwork.ozlabs.org; Tue, 03 Jan 2012 16:24:25 -0500 Received: from eggs.gnu.org ([140.186.70.92]:34086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RiBq1-0008Qz-0c for qemu-devel@nongnu.org; Tue, 03 Jan 2012 16:24:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RiBpz-0006sw-0g for qemu-devel@nongnu.org; Tue, 03 Jan 2012 16:24:04 -0500 Received: from dsl212-143-172-188.bb.netvision.net.il ([212.143.172.188]:42111 helo=dhcp-1-120.tlv.redhat.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RiBpy-0006rY-Hd for qemu-devel@nongnu.org; Tue, 03 Jan 2012 16:24:02 -0500 Received: from dhcp-1-120.tlv.redhat.com (localhost.localdomain [127.0.0.1]) by dhcp-1-120.tlv.redhat.com (8.14.5/8.14.5) with ESMTP id q03DhOe5029512; Tue, 3 Jan 2012 15:43:24 +0200 Received: (from owasserm@localhost) by dhcp-1-120.tlv.redhat.com (8.14.5/8.14.5/Submit) id q03DhNUa029511; Tue, 3 Jan 2012 15:43:23 +0200 From: Orit Wasserman To: qemu-devel@nongnu.org Date: Tue, 3 Jan 2012 15:35:40 +0200 Message-Id: <1325597745-29293-5-git-send-email-owasserm@redhat.com> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1325597745-29293-1-git-send-email-owasserm@redhat.com> References: <1325597745-29293-1-git-send-email-owasserm@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.143.172.188 Cc: blauwirbel@gmail.com, stefanha@gmail.com, Orit Wasserman , quintela@redhat.com Subject: [Qemu-devel] [PATCH v5 4/9] Add host_from_stream_offset_versioned function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);