Received: from eggs.gnu.org ([2001:4830:134:3::10]:43362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VfTyJ-000557-D4 for qemu-devel@nongnu.org; Sun, 10 Nov 2013 07:18:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VfTyD-0003E2-9H for qemu-devel@nongnu.org; Sun, 10 Nov 2013 07:18:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:23591) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VfTyD-0003Dy-12 for qemu-devel@nongnu.org; Sun, 10 Nov 2013 07:18:25 -0500 From: Marcel Apfelbaum Date: Sun, 10 Nov 2013 14:15:25 +0200 Message-Id: <1384085725-23522-3-git-send-email-marcel.a@redhat.com> In-Reply-To: <1384085725-23522-1-git-send-email-marcel.a@redhat.com> References: <1384085725-23522-1-git-send-email-marcel.a@redhat.com> Subject: [Qemu-devel] [PATCH for-1.7 2/2] Revert "exec: limit system memory size" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, ehabkost@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, agraf@suse.de, lcapitulino@redhat.com, aliguori@amazon.com, pbonzini@redhat.com, lersek@redhat.com, afaerber@suse.de, rth@twiddle.net From: "Michael S. Tsirkin" This reverts commit 818f86b88394b7b2b59d313e51043fe15a8004db. This was a work-around for bugs elsewhere in the system, exposed by commit a53ae8e934cd54686875b5bcfc2f434244ee55d6: "hw/pci: partially handle pci master abort" since that's reverted now, the work-around is not required for 1.7 anymore. The proper fix is supporting full 64 bit addresses in the radix tree. Signed-off-by: Michael S. Tsirkin Signed-off-by: Marcel Apfelbaum --- exec.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/exec.c b/exec.c index 79610ce..b453713 100644 --- a/exec.c +++ b/exec.c @@ -1741,12 +1741,7 @@ void address_space_destroy_dispatch(AddressSpace *as) static void memory_map_init(void) { system_memory = g_malloc(sizeof(*system_memory)); - - assert(TARGET_PHYS_ADDR_SPACE_BITS <= 64); - - memory_region_init(system_memory, NULL, "system", - TARGET_PHYS_ADDR_SPACE_BITS == 64 ? - UINT64_MAX : (0x1ULL << TARGET_PHYS_ADDR_SPACE_BITS)); + memory_region_init(system_memory, NULL, "system", INT64_MAX); address_space_init(&address_space_memory, system_memory, "memory"); system_io = g_malloc(sizeof(*system_io)); -- 1.8.3.1