From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:36764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFSeT-0001r6-DG for qemu-devel@nongnu.org; Sun, 16 Oct 2011 11:29:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RFSeS-0006mG-Cg for qemu-devel@nongnu.org; Sun, 16 Oct 2011 11:29:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60538) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFSeS-0006m4-5g for qemu-devel@nongnu.org; Sun, 16 Oct 2011 11:29:24 -0400 From: Avi Kivity Date: Sun, 16 Oct 2011 17:29:07 +0200 Message-Id: <1318778947-1612-1-git-send-email-avi@redhat.com> In-Reply-To: <1318764264-22745-1-git-send-email-avi@redhat.com> References: <1318764264-22745-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [RFC128 3/2] Adjust system and pci address spaces to full 64-bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, David Gibson Now that the memory API supports full 64-bit buses, adjust the relevant callers to take advantage of it. Signed-off-by: Avi Kivity --- Note needs slight adjustment to patch 2 to make 'info mtree' work. exec.c | 2 +- hw/pc_piix.c | 2 +- hw/pci_bridge.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exec.c b/exec.c index d0cbf15..16e37a7 100644 --- a/exec.c +++ b/exec.c @@ -3825,7 +3825,7 @@ static void io_mem_init(void) static void memory_map_init(void) { system_memory = g_malloc(sizeof(*system_memory)); - memory_region_init(system_memory, "system", INT64_MAX); + memory_region_init(system_memory, "system", UINT64_MAX); set_system_memory_map(system_memory); system_io = g_malloc(sizeof(*system_io)); diff --git a/hw/pc_piix.c b/hw/pc_piix.c index ce1c87f..45540e5 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -115,7 +115,7 @@ static void pc_init1(MemoryRegion *system_memory, if (pci_enabled) { pci_memory = g_new(MemoryRegion, 1); - memory_region_init(pci_memory, "pci", INT64_MAX); + memory_region_init(pci_memory, "pci", UINT64_MAX); rom_memory = pci_memory; } else { pci_memory = NULL; diff --git a/hw/pci_bridge.c b/hw/pci_bridge.c index b6287cd..3b786aa 100644 --- a/hw/pci_bridge.c +++ b/hw/pci_bridge.c @@ -319,7 +319,7 @@ int pci_bridge_initfn(PCIDevice *dev) sec_bus->parent_dev = dev; sec_bus->map_irq = br->map_irq; sec_bus->address_space_mem = &br->address_space_mem; - memory_region_init(&br->address_space_mem, "pci_pridge_pci", INT64_MAX); + memory_region_init(&br->address_space_mem, "pci_pridge_pci", UINT64_MAX); sec_bus->address_space_io = &br->address_space_io; memory_region_init(&br->address_space_io, "pci_bridge_io", 65536); pci_bridge_region_init(br); -- 1.7.6.3