From patchwork Mon Jul 25 14:02:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 106682 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 EB265B6F8E for ; Tue, 26 Jul 2011 00:34:41 +1000 (EST) Received: from localhost ([::1]:52046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlLlN-0006LX-Ik for incoming@patchwork.ozlabs.org; Mon, 25 Jul 2011 10:04:05 -0400 Received: from eggs.gnu.org ([140.186.70.92]:47295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlLka-0003n6-DD for qemu-devel@nongnu.org; Mon, 25 Jul 2011 10:03:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QlLkT-00051K-5D for qemu-devel@nongnu.org; Mon, 25 Jul 2011 10:03:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30366) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlLkS-00050r-Q0 for qemu-devel@nongnu.org; Mon, 25 Jul 2011 10:03:09 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p6PE373m008831 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 25 Jul 2011 10:03:07 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p6PE37g2011643; Mon, 25 Jul 2011 10:03:07 -0400 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id C2EB7250B3A; Mon, 25 Jul 2011 17:03:06 +0300 (IDT) From: Avi Kivity To: qemu-devel@nongnu.org Date: Mon, 25 Jul 2011 17:02:45 +0300 Message-Id: <1311602584-23409-5-git-send-email-avi@redhat.com> In-Reply-To: <1311602584-23409-1-git-send-email-avi@redhat.com> References: <1311602584-23409-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 04/23] Internal interfaces for 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 get_system_memory() provides the root of the memory hierarchy. This interface is intended to be private between memory.c and exec.c. If this file is included elsewhere, it should be regarded as a bug (or TODO item). However, it will be temporarily needed for the conversion to hierarchical memory routing. Signed-off-by: Avi Kivity Reviewed-by: Anthony Liguori --- exec-memory.h | 23 +++++++++++++++++++++++ memory.c | 7 +++++++ 2 files changed, 30 insertions(+), 0 deletions(-) create mode 100644 exec-memory.h diff --git a/exec-memory.h b/exec-memory.h new file mode 100644 index 0000000..7eb9085 --- /dev/null +++ b/exec-memory.h @@ -0,0 +1,23 @@ +#ifndef EXEC_MEMORY_H +#define EXEC_MEMORY_H + +/* + * Internal interfaces between memory.c/exec.c/vl.c. Do not #include unless + * you're one of them. + */ + +#include "memory.h" + +#ifndef CONFIG_USER_ONLY + +/* Get the root memory region. This interface should only be used temporarily + * until a proper bus interface is available. + */ +MemoryRegion *get_system_memory(void); + +/* Set the root memory region. This region is the system memory map. */ +void set_system_memory_map(MemoryRegion *mr); + +#endif + +#endif diff --git a/memory.c b/memory.c index 339bea3..48470d2 100644 --- a/memory.c +++ b/memory.c @@ -12,6 +12,7 @@ */ #include "memory.h" +#include "exec-memory.h" #include typedef struct AddrRange AddrRange; @@ -698,3 +699,9 @@ void memory_region_del_subregion(MemoryRegion *mr, QTAILQ_REMOVE(&mr->subregions, subregion, subregions_link); memory_region_update_topology(); } + +void set_system_memory_map(MemoryRegion *mr) +{ + root_memory_region = mr; + memory_region_update_topology(); +}