Revision f25608e9 hw/musicpal.c
| b/hw/musicpal.c | ||
|---|---|---|
| 1513 | 1513 |
const char *kernel_filename, const char *kernel_cmdline, |
| 1514 | 1514 |
const char *initrd_filename, const char *cpu_model) |
| 1515 | 1515 |
{
|
| 1516 |
CPUARMState *env;
|
|
| 1516 |
ARMCPU *cpu;
|
|
| 1517 | 1517 |
qemu_irq *cpu_pic; |
| 1518 | 1518 |
qemu_irq pic[32]; |
| 1519 | 1519 |
DeviceState *dev; |
| ... | ... | |
| 1533 | 1533 |
if (!cpu_model) {
|
| 1534 | 1534 |
cpu_model = "arm926"; |
| 1535 | 1535 |
} |
| 1536 |
env = cpu_init(cpu_model);
|
|
| 1537 |
if (!env) {
|
|
| 1536 |
cpu = cpu_arm_init(cpu_model);
|
|
| 1537 |
if (!cpu) {
|
|
| 1538 | 1538 |
fprintf(stderr, "Unable to find CPU definition\n"); |
| 1539 | 1539 |
exit(1); |
| 1540 | 1540 |
} |
| 1541 |
cpu_pic = arm_pic_init_cpu(env); |
|
| 1541 |
cpu_pic = arm_pic_init_cpu(&cpu->env);
|
|
| 1542 | 1542 |
|
| 1543 | 1543 |
/* For now we use a fixed - the original - RAM size */ |
| 1544 | 1544 |
memory_region_init_ram(ram, "musicpal.ram", MP_RAM_DEFAULT_SIZE); |
| ... | ... | |
| 1651 | 1651 |
musicpal_binfo.kernel_filename = kernel_filename; |
| 1652 | 1652 |
musicpal_binfo.kernel_cmdline = kernel_cmdline; |
| 1653 | 1653 |
musicpal_binfo.initrd_filename = initrd_filename; |
| 1654 |
arm_load_kernel(env, &musicpal_binfo); |
|
| 1654 |
arm_load_kernel(&cpu->env, &musicpal_binfo);
|
|
| 1655 | 1655 |
} |
| 1656 | 1656 |
|
| 1657 | 1657 |
static QEMUMachine musicpal_machine = {
|
Also available in: Unified diff