[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/25] ppc440: Pass in address_space_mem to ppc440ep
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 11/25] ppc440: Pass in address_space_mem to ppc440ep_init |
Date: |
Sun, 2 Oct 2011 16:26:42 +0200 |
From: Richard Henderson <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/ppc440.c | 11 +++++------
hw/ppc440.h | 6 +++---
hw/ppc440_bamboo.c | 5 ++++-
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/hw/ppc440.c b/hw/ppc440.c
index 1d1376e..cd8a95d 100644
--- a/hw/ppc440.c
+++ b/hw/ppc440.c
@@ -20,7 +20,6 @@
#include "ppc405.h"
#include "sysemu.h"
#include "kvm.h"
-#include "exec-memory.h"
#define PPC440EP_PCI_CONFIG 0xeec00000
#define PPC440EP_PCI_INTACK 0xeed00000
@@ -35,9 +34,9 @@
256<<20, 128<<20, 64<<20, 32<<20, 16<<20, 8<<20, 0
};
-CPUState *ppc440ep_init(ram_addr_t *ram_size, PCIBus **pcip,
- const unsigned int pci_irq_nrs[4], int do_init,
- const char *cpu_model)
+CPUState *ppc440ep_init(MemoryRegion *address_space_mem, ram_addr_t *ram_size,
+ PCIBus **pcip, const unsigned int pci_irq_nrs[4],
+ int do_init, const char *cpu_model)
{
MemoryRegion *ram_memories
= g_malloc(PPC440EP_SDRAM_NR_BANKS * sizeof(*ram_memories));
@@ -93,12 +92,12 @@
isa_mmio_init(PPC440EP_PCI_IO, PPC440EP_PCI_IOLEN);
if (serial_hds[0] != NULL) {
- serial_mm_init(get_system_memory(), 0xef600300, 0, pic[0],
+ serial_mm_init(address_space_mem, 0xef600300, 0, pic[0],
PPC_SERIAL_MM_BAUDBASE, serial_hds[0],
DEVICE_BIG_ENDIAN);
}
if (serial_hds[1] != NULL) {
- serial_mm_init(get_system_memory(), 0xef600400, 0, pic[1],
+ serial_mm_init(address_space_mem, 0xef600400, 0, pic[1],
PPC_SERIAL_MM_BAUDBASE, serial_hds[1],
DEVICE_BIG_ENDIAN);
}
diff --git a/hw/ppc440.h b/hw/ppc440.h
index a40f917..9c27c36 100644
--- a/hw/ppc440.h
+++ b/hw/ppc440.h
@@ -14,8 +14,8 @@
#include "hw.h"
-CPUState *ppc440ep_init(ram_addr_t *ram_size, PCIBus **pcip,
- const unsigned int pci_irq_nrs[4], int do_init,
- const char *cpu_model);
+CPUState *ppc440ep_init(MemoryRegion *address_space, ram_addr_t *ram_size,
+ PCIBus **pcip, const unsigned int pci_irq_nrs[4],
+ int do_init, const char *cpu_model);
#endif
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 1addb68..9228939 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -23,6 +23,7 @@
#include "device_tree.h"
#include "loader.h"
#include "elf.h"
+#include "exec-memory.h"
#define BINARY_DEVICE_TREE_FILE "bamboo.dtb"
@@ -96,6 +97,7 @@ static void bamboo_init(ram_addr_t ram_size,
const char *cpu_model)
{
unsigned int pci_irq_nrs[4] = { 28, 27, 26, 25 };
+ MemoryRegion *address_space_mem = get_system_memory();
PCIBus *pcibus;
CPUState *env;
uint64_t elf_entry;
@@ -107,7 +109,8 @@ static void bamboo_init(ram_addr_t ram_size,
int i;
/* Setup CPU. */
- env = ppc440ep_init(&ram_size, &pcibus, pci_irq_nrs, 1, cpu_model);
+ env = ppc440ep_init(address_space_mem, &ram_size, &pcibus,
+ pci_irq_nrs, 1, cpu_model);
if (pcibus) {
/* Register network interfaces. */
--
1.7.6.3
- [Qemu-devel] [PATCH 15/25] hw/smc91c111: Convert to MemoryRegion, (continued)
- [Qemu-devel] [PATCH 15/25] hw/smc91c111: Convert to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 10/25] ppc405: Pass in address_space_mem to ppc405{cr, ep}_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 25/25] milkymist-{minimac2, softusb}: rename memory names, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 08/25] serial: Remove ioregister parameter from serial_mm_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 05/25] etrax-eth: Convert to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 19/25] milkymist-memcard: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 24/25] milkymist-vgafb: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 23/25] milkymist-uart: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 07/25] serial: Use enum device_endian in serial_mm_init parameter, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 18/25] milkymist-hpdmc: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 11/25] ppc440: Pass in address_space_mem to ppc440ep_init,
Avi Kivity <=
- [Qemu-devel] [PATCH 12/25] pxa: Pass in address_space to pxa{255, 270}_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 06/25] serial: Convert serial_mm_init to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 03/25] etrax-timer: Convert to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 22/25] milkymist-tmu2: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 17/25] milkymist-ac97: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 14/25] sun4u: Pass address_space_mem to sun4uv_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 13/25] sm501: Pass address_space_mem to sm501_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 04/25] etrax-dma: Convert to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 09/25] serial: Add MemoryRegion parameter to serial_mm_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 16/25] openpic: Memory API conversion for mpic, Avi Kivity, 2011/10/02