From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: [RFC v5 05/86] Internal interfaces for memory API Date: Wed, 20 Jul 2011 19:49:15 +0300 Message-ID: <1311180636-17012-6-git-send-email-avi@redhat.com> References: <1311180636-17012-1-git-send-email-avi@redhat.com> Cc: kvm@vger.kernel.org To: qemu-devel@nongnu.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:18911 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751870Ab1GTQuo (ORCPT ); Wed, 20 Jul 2011 12:50:44 -0400 In-Reply-To: <1311180636-17012-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: 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 --- 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(); +} -- 1.7.5.3 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:60192) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qja9L-0007jR-HY for qemu-devel@nongnu.org; Wed, 20 Jul 2011 13:01:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjZyw-0004xg-Mc for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:51:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37818) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZyt-0004u2-CG for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:50:43 -0400 From: Avi Kivity Date: Wed, 20 Jul 2011 19:49:15 +0300 Message-Id: <1311180636-17012-6-git-send-email-avi@redhat.com> In-Reply-To: <1311180636-17012-1-git-send-email-avi@redhat.com> References: <1311180636-17012-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [RFC v5 05/86] Internal interfaces for memory API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.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 --- 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(); +} -- 1.7.5.3