diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-11-19 11:17:11 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-11-19 11:17:11 +0000 |
| commit | 05a86f23e5ca83348eface349429341cefb8697b (patch) | |
| tree | 6c33ddc0703342c418e697eaba72b6b0c1fafbb9 /hw/spapr.c | |
| parent | 15d4a723381bb57dc31007ca46661f42eb67a100 (diff) | |
| parent | 1e34d859d01a408dc8479b1858bb103aa3b4f9a7 (diff) | |
| download | focaccia-qemu-05a86f23e5ca83348eface349429341cefb8697b.tar.gz focaccia-qemu-05a86f23e5ca83348eface349429341cefb8697b.zip | |
Merge branch 'ppc-1.0' of git://repo.or.cz/qemu/agraf
* 'ppc-1.0' of git://repo.or.cz/qemu/agraf: pseries: Fix qdev.id handling in the VIO bus code pseries: Allow kernel's early debug output to work pseries: Default reg for vty should be SPAPR_VTY_BASE_ADDRESS pseries: Check we have a chardev in spapr_vty_init() pseries: Fix buggy spapr_vio_find_by_reg() pseries: Correct RAM size check for SLOF PPC: Fix for the gdb single step problem on an rfi instruction tcg-ppc64: Fix compile errors for userspace only builds with gcc 4.6 pseries: Fix initialization of sPAPREnvironment structure
Diffstat (limited to 'hw/spapr.c')
| -rw-r--r-- | hw/spapr.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/hw/spapr.c b/hw/spapr.c index bdaa938b6b..2b901f105e 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -57,7 +57,7 @@ #define FW_MAX_SIZE 0x400000 #define FW_FILE_NAME "slof.bin" -#define MIN_RAM_SLOF 512UL +#define MIN_RMA_SLOF 128UL #define TIMEBASE_FREQ 512000000ULL @@ -407,7 +407,9 @@ static void ppc_spapr_init(ram_addr_t ram_size, long pteg_shift = 17; char *filename; - spapr = g_malloc(sizeof(*spapr)); + spapr = g_malloc0(sizeof(*spapr)); + QLIST_INIT(&spapr->phbs); + cpu_ppc_hypercall = emulate_spapr_hypercall; /* Allocate RMA if necessary */ @@ -560,9 +562,9 @@ static void ppc_spapr_init(ram_addr_t ram_size, spapr->entry_point = KERNEL_LOAD_ADDR; } else { - if (ram_size < (MIN_RAM_SLOF << 20)) { + if (rma_size < (MIN_RMA_SLOF << 20)) { fprintf(stderr, "qemu: pSeries SLOF firmware requires >= " - "%ldM guest RAM\n", MIN_RAM_SLOF); + "%ldM guest RMA (Real Mode Area memory)\n", MIN_RMA_SLOF); exit(1); } filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, FW_FILE_NAME); |