OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ppc: Don't duplicate QEMUMachineInitArgs in PPCE500Params

Browse Source 
Pass on the generic arguments unadulterated, and the machine-specific
ones as separate argument.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Markus Armbruster 2013-08-16 13:13:49 +02:00 committed by Michael S. Tsirkin
parent ee87e32f83
commit 9223836745
4 changed files with 23 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
hw/ppc/e500.c
View File

@ -124,13 +124,14 @@ static void dt_serial_create(void *fdt, unsigned long long offset,
} }
static int ppce500_load_device_tree(CPUPPCState *env, static int ppce500_load_device_tree(CPUPPCState *env,
QEMUMachineInitArgs *args,
PPCE500Params *params, PPCE500Params *params,
hwaddr addr, hwaddr addr,
hwaddr initrd_base, hwaddr initrd_base,
hwaddr initrd_size) hwaddr initrd_size)
{ {
int ret = -1; int ret = -1;
uint64_t mem_reg_property[] = { 0, cpu_to_be64(params->ram_size) }; uint64_t mem_reg_property[] = { 0, cpu_to_be64(args->ram_size) };
int fdt_size; int fdt_size;
void *fdt; void *fdt;
uint8_t hypercall[16]; uint8_t hypercall[16];
@ -205,7 +206,7 @@ static int ppce500_load_device_tree(CPUPPCState *env,
} }
ret = qemu_devtree_setprop_string(fdt, "/chosen", "bootargs", ret = qemu_devtree_setprop_string(fdt, "/chosen", "bootargs",
params->kernel_cmdline); args->kernel_cmdline);
if (ret < 0) if (ret < 0)
fprintf(stderr, "couldn't set /chosen/bootargs\n"); fprintf(stderr, "couldn't set /chosen/bootargs\n");
@ -559,7 +560,7 @@ static qemu_irq *ppce500_init_mpic(PPCE500Params *params, MemoryRegion *ccsr,
return mpic; return mpic;
} }
void ppce500_init(PPCE500Params *params) void ppce500_init(QEMUMachineInitArgs *args, PPCE500Params *params)
{ {
MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *address_space_mem = get_system_memory();
MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *ram = g_new(MemoryRegion, 1);
@ -584,8 +585,8 @@ void ppce500_init(PPCE500Params *params)
PPCE500CCSRState *ccsr; PPCE500CCSRState *ccsr;
/* Setup CPUs */ /* Setup CPUs */
if (params->cpu_model == NULL) { if (args->cpu_model == NULL) {
params->cpu_model = "e500v2_v30"; args->cpu_model = "e500v2_v30";
} }
irqs = g_malloc0(smp_cpus * sizeof(qemu_irq *)); irqs = g_malloc0(smp_cpus * sizeof(qemu_irq *));
@ -595,7 +596,7 @@ void ppce500_init(PPCE500Params *params)
CPUState *cs; CPUState *cs;
qemu_irq *input; qemu_irq *input;
cpu = cpu_ppc_init(params->cpu_model); cpu = cpu_ppc_init(args->cpu_model);
if (cpu == NULL) { if (cpu == NULL) {
fprintf(stderr, "Unable to initialize CPU!\n"); fprintf(stderr, "Unable to initialize CPU!\n");
exit(1); exit(1);
@ -634,7 +635,7 @@ void ppce500_init(PPCE500Params *params)
/* Fixup Memory size on a alignment boundary */ /* Fixup Memory size on a alignment boundary */
ram_size &= ~(RAM_SIZES_ALIGN - 1); ram_size &= ~(RAM_SIZES_ALIGN - 1);
params->ram_size = ram_size; args->ram_size = ram_size;
/* Register Memory */ /* Register Memory */
memory_region_init_ram(ram, NULL, "mpc8544ds.ram", ram_size); memory_region_init_ram(ram, NULL, "mpc8544ds.ram", ram_size);
@ -701,11 +702,11 @@ void ppce500_init(PPCE500Params *params)
sysbus_create_simple("e500-spin", MPC8544_SPIN_BASE, NULL); sysbus_create_simple("e500-spin", MPC8544_SPIN_BASE, NULL);
/* Load kernel. */ /* Load kernel. */
if (params->kernel_filename) { if (args->kernel_filename) {
kernel_size = load_uimage(params->kernel_filename, &entry, kernel_size = load_uimage(args->kernel_filename, &entry,
&loadaddr, NULL); &loadaddr, NULL);
if (kernel_size < 0) { if (kernel_size < 0) {
kernel_size = load_elf(params->kernel_filename, NULL, NULL, kernel_size = load_elf(args->kernel_filename, NULL, NULL,
&elf_entry, &elf_lowaddr, NULL, 1, &elf_entry, &elf_lowaddr, NULL, 1,
ELF_MACHINE, 0); ELF_MACHINE, 0);
entry = elf_entry; entry = elf_entry;
@ -714,7 +715,7 @@ void ppce500_init(PPCE500Params *params)
/* XXX try again as binary */ /* XXX try again as binary */
if (kernel_size < 0) { if (kernel_size < 0) {
fprintf(stderr, "qemu: could not load kernel '%s'\n", fprintf(stderr, "qemu: could not load kernel '%s'\n",
params->kernel_filename); args->kernel_filename);
exit(1); exit(1);
} }
@ -726,14 +727,14 @@ void ppce500_init(PPCE500Params *params)
} }
/* Load initrd. */ /* Load initrd. */
if (params->initrd_filename) { if (args->initrd_filename) {
initrd_base = (cur_base + INITRD_LOAD_PAD) & ~INITRD_PAD_MASK; initrd_base = (cur_base + INITRD_LOAD_PAD) & ~INITRD_PAD_MASK;
initrd_size = load_image_targphys(params->initrd_filename, initrd_base, initrd_size = load_image_targphys(args->initrd_filename, initrd_base,
ram_size - initrd_base); ram_size - initrd_base);
if (initrd_size < 0) { if (initrd_size < 0) {
fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
params->initrd_filename); args->initrd_filename);
exit(1); exit(1);
} }
@ -741,12 +742,12 @@ void ppce500_init(PPCE500Params *params)
} }
/* If we're loading a kernel directly, we must load the device tree too. */ /* If we're loading a kernel directly, we must load the device tree too. */
if (params->kernel_filename) { if (args->kernel_filename) {
struct boot_info *boot_info; struct boot_info *boot_info;
int dt_size; int dt_size;
dt_size = ppce500_load_device_tree(env, params, dt_base, initrd_base, dt_size = ppce500_load_device_tree(env, args, params, dt_base,
initrd_size); initrd_base, initrd_size);
if (dt_size < 0) { if (dt_size < 0) {
fprintf(stderr, "couldn't load device tree\n"); fprintf(stderr, "couldn't load device tree\n");
exit(1); exit(1);

13
hw/ppc/e500.h
View File

@ -1,25 +1,18 @@
#ifndef PPCE500_H #ifndef PPCE500_H
#define PPCE500_H #define PPCE500_H
#include "hw/boards.h"
typedef struct PPCE500Params { typedef struct PPCE500Params {
/* Standard QEMU machine init params */
ram_addr_t ram_size;
const char *boot_device;
const char *kernel_filename;
const char *kernel_cmdline;
const char *initrd_filename;
const char *cpu_model;
int pci_first_slot; int pci_first_slot;
int pci_nr_slots; int pci_nr_slots;
/* e500-specific params */
/* required -- must at least add toplevel board compatible */ /* required -- must at least add toplevel board compatible */
void (*fixup_devtree)(struct PPCE500Params *params, void *fdt); void (*fixup_devtree)(struct PPCE500Params *params, void *fdt);
int mpic_version; int mpic_version;
} PPCE500Params; } PPCE500Params;
void ppce500_init(PPCE500Params *params); void ppce500_init(QEMUMachineInitArgs *args, PPCE500Params *params);
#endif #endif

8
hw/ppc/e500plat.c
View File

@ -31,12 +31,6 @@ static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
static void e500plat_init(QEMUMachineInitArgs *args) static void e500plat_init(QEMUMachineInitArgs *args)
{ {
PPCE500Params params = { PPCE500Params params = {
.ram_size = args->ram_size,
.boot_device = args->boot_device,
.kernel_filename = args->kernel_filename,
.kernel_cmdline = args->kernel_cmdline,
.initrd_filename = args->initrd_filename,
.cpu_model = args->cpu_model,
.pci_first_slot = 0x1, .pci_first_slot = 0x1,
.pci_nr_slots = PCI_SLOT_MAX - 1, .pci_nr_slots = PCI_SLOT_MAX - 1,
.fixup_devtree = e500plat_fixup_devtree, .fixup_devtree = e500plat_fixup_devtree,
@ -49,7 +43,7 @@ static void e500plat_init(QEMUMachineInitArgs *args)
params.mpic_version = OPENPIC_MODEL_FSL_MPIC_20; params.mpic_version = OPENPIC_MODEL_FSL_MPIC_20;
} }
ppce500_init(&params); ppce500_init(args, &params);
} }
static QEMUMachine e500plat_machine = { static QEMUMachine e500plat_machine = {

8
hw/ppc/mpc8544ds.c
View File

@ -29,19 +29,13 @@ static void mpc8544ds_fixup_devtree(PPCE500Params *params, void *fdt)
static void mpc8544ds_init(QEMUMachineInitArgs *args) static void mpc8544ds_init(QEMUMachineInitArgs *args)
{ {
PPCE500Params params = { PPCE500Params params = {
.ram_size = args->ram_size,
.boot_device = args->boot_device,
.kernel_filename = args->kernel_filename,
.kernel_cmdline = args->kernel_cmdline,
.initrd_filename = args->initrd_filename,
.cpu_model = args->cpu_model,
.pci_first_slot = 0x11, .pci_first_slot = 0x11,
.pci_nr_slots = 2, .pci_nr_slots = 2,
.fixup_devtree = mpc8544ds_fixup_devtree, .fixup_devtree = mpc8544ds_fixup_devtree,
.mpic_version = OPENPIC_MODEL_FSL_MPIC_20, .mpic_version = OPENPIC_MODEL_FSL_MPIC_20,
}; };
ppce500_init(&params); ppce500_init(args, &params);
} }