From patchwork Wed Dec 21 13:34:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 132645 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 8DB1CB711E for ; Thu, 22 Dec 2011 00:57:55 +1100 (EST) Received: from localhost ([::1]:54656 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RdMKu-0000o5-Sp for incoming@patchwork.ozlabs.org; Wed, 21 Dec 2011 08:36:00 -0500 Received: from eggs.gnu.org ([140.186.70.92]:41090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RdMJy-0007Cz-FF for qemu-devel@nongnu.org; Wed, 21 Dec 2011 08:35:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RdMJq-0004oj-2V for qemu-devel@nongnu.org; Wed, 21 Dec 2011 08:35:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:29731) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RdMJp-0004o4-KI for qemu-devel@nongnu.org; Wed, 21 Dec 2011 08:34:53 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pBLDYqk4000403 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 21 Dec 2011 08:34:52 -0500 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id pBLDYoK1005666; Wed, 21 Dec 2011 08:34:51 -0500 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id E1272250BA3; Wed, 21 Dec 2011 15:34:44 +0200 (IST) From: Avi Kivity To: Anthony Liguori , qemu-devel@nongnu.org, quintela@redhat.com Date: Wed, 21 Dec 2011 15:34:34 +0200 Message-Id: <1324474477-22267-6-git-send-email-avi@redhat.com> In-Reply-To: <1324474477-22267-1-git-send-email-avi@redhat.com> References: <1324474477-22267-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 5/8] Convert ram_load() to the memory API 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: Avi Kivity --- arch_init.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch_init.c b/arch_init.c index 9b8a1f3..381c055 100644 --- a/arch_init.c +++ b/arch_init.c @@ -344,7 +344,7 @@ int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) return NULL; } - return block->host + offset; + return memory_region_get_ram_ptr(block->mr) + offset; } len = qemu_get_byte(f); @@ -353,7 +353,7 @@ int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) QLIST_FOREACH(block, &ram_list.blocks, next) { if (!strncmp(id, block->idstr, sizeof(id))) - return block->host + offset; + return memory_region_get_ram_ptr(block->mr) + offset; } fprintf(stderr, "Can't find block %s!\n", id);