From patchwork Mon Aug 8 13:09:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 108956 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 75842B6EE8 for ; Tue, 9 Aug 2011 00:40:53 +1000 (EST) Received: from localhost ([::1]:49244 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqPbW-0004Jh-LX for incoming@patchwork.ozlabs.org; Mon, 08 Aug 2011 09:10:50 -0400 Received: from eggs.gnu.org ([140.186.70.92]:52012) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqPaP-0002HS-Q3 for qemu-devel@nongnu.org; Mon, 08 Aug 2011 09:09:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QqPaL-0002Ia-N2 for qemu-devel@nongnu.org; Mon, 08 Aug 2011 09:09:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1586) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqPaL-0002IG-Ft for qemu-devel@nongnu.org; Mon, 08 Aug 2011 09:09:37 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p78D9aFD005540 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 8 Aug 2011 09:09:36 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p78D9ZHO029395; Mon, 8 Aug 2011 09:09:35 -0400 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 1606E250B4C; Mon, 8 Aug 2011 16:09:34 +0300 (IDT) From: Avi Kivity To: Anthony Liguori , qemu-devel@nongnu.org Date: Mon, 8 Aug 2011 16:09:03 +0300 Message-Id: <1312808972-1718-11-git-send-email-avi@redhat.com> In-Reply-To: <1312808972-1718-1-git-send-email-avi@redhat.com> References: <1312808972-1718-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 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, "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH v4 10/39] Integrate I/O memory regions into qemu 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_io() returns the root I/O memory region. Reviewed-by: Richard Henderson Signed-off-by: Avi Kivity --- exec-memory.h | 5 +++++ exec.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/exec-memory.h b/exec-memory.h index c439aba..334219f 100644 --- a/exec-memory.h +++ b/exec-memory.h @@ -28,6 +28,11 @@ */ MemoryRegion *get_system_memory(void); +/* Get the root I/O port region. This interface should only be used + * temporarily until a proper bus interface is available. + */ +MemoryRegion *get_system_io(void); + /* Set the root memory region. This region is the system memory map. */ void set_system_memory_map(MemoryRegion *mr); diff --git a/exec.c b/exec.c index 719fff9..be7e4b2 100644 --- a/exec.c +++ b/exec.c @@ -113,6 +113,7 @@ static int in_migration; RAMList ram_list = { .blocks = QLIST_HEAD_INITIALIZER(ram_list) }; static MemoryRegion *system_memory; +static MemoryRegion *system_io; #endif @@ -3830,6 +3831,10 @@ static void memory_map_init(void) system_memory = qemu_malloc(sizeof(*system_memory)); memory_region_init(system_memory, "system", INT64_MAX); set_system_memory_map(system_memory); + + system_io = qemu_malloc(sizeof(*system_io)); + memory_region_init(system_io, "io", 65536); + set_system_io_map(system_io); } MemoryRegion *get_system_memory(void) @@ -3837,6 +3842,11 @@ MemoryRegion *get_system_memory(void) return system_memory; } +MemoryRegion *get_system_io(void) +{ + return system_io; +} + #endif /* !defined(CONFIG_USER_ONLY) */ /* physical memory access (slow version, mainly for debug) */