mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PPC: E500: create multiple envs

Browse Source 
When creating a VM, we should go through smp_cpus and create a virtual CPU for
every CPU the user requested. This patch adds support for that and moves some
code around to make that more convenient.

Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexander Graf 2011-07-21 01:41:16 +02:00
parent bbc5842211
commit e61c36d58d
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
hw/ppce500_mpc8544ds.c
View File

@ -226,7 +226,7 @@ static void mpc8544ds_init(ram_addr_t ram_size,
const char *cpu_model) const char *cpu_model)
{ {
PCIBus *pci_bus; PCIBus *pci_bus;
CPUState *env; CPUState *env = NULL;
uint64_t elf_entry; uint64_t elf_entry;
uint64_t elf_lowaddr; uint64_t elf_lowaddr;
target_phys_addr_t entry=0; target_phys_addr_t entry=0;
@ -240,24 +240,40 @@ static void mpc8544ds_init(ram_addr_t ram_size,
qemu_irq *irqs, *mpic; qemu_irq *irqs, *mpic;
DeviceState *dev; DeviceState *dev;
struct boot_info *boot_info; struct boot_info *boot_info;
CPUState *firstenv = NULL;
/* Setup CPU */ /* Setup CPUs */
if (cpu_model == NULL) { if (cpu_model == NULL) {
cpu_model = "e500v2_v30"; cpu_model = "e500v2_v30";
} }
env = cpu_ppc_init(cpu_model); for (i = 0; i < smp_cpus; i++) {
if (!env) { qemu_irq *input;
fprintf(stderr, "Unable to initialize CPU!\n"); env = cpu_ppc_init(cpu_model);
exit(1); if (!env) {
fprintf(stderr, "Unable to initialize CPU!\n");
exit(1);
}
if (!firstenv) {
firstenv = env;
}
env->spr[SPR_BOOKE_PIR] = env->cpu_index = i;
/* XXX register timer? */
ppc_emb_timers_init(env, 400000000, PPC_INTERRUPT_DECR);
ppc_dcr_init(env, NULL, NULL);
/* XXX Enable DEC interrupts - probably wrong in the backend */
env->spr[SPR_40x_TCR] = 1 << 26;
/* Register reset handler */
boot_info = g_malloc0(sizeof(struct boot_info));
qemu_register_reset(mpc8544ds_cpu_reset, env);
env->load_info = boot_info;
} }
/* XXX register timer? */ env = firstenv;
ppc_emb_timers_init(env, 400000000, PPC_INTERRUPT_DECR);
ppc_dcr_init(env, NULL, NULL);
/* Register reset handler */
qemu_register_reset(mpc8544ds_cpu_reset, env);
/* 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);
@ -336,8 +352,6 @@ static void mpc8544ds_init(ram_addr_t ram_size,
} }
} }
boot_info = g_malloc0(sizeof(struct boot_info));
/* 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 (kernel_filename) { if (kernel_filename) {
#ifndef CONFIG_FDT #ifndef CONFIG_FDT
@ -350,10 +364,10 @@ static void mpc8544ds_init(ram_addr_t ram_size,
exit(1); exit(1);
} }
boot_info = env->load_info;
boot_info->entry = entry; boot_info->entry = entry;
boot_info->dt_base = dt_base; boot_info->dt_base = dt_base;
} }
env->load_info = boot_info;
if (kvm_enabled()) { if (kvm_enabled()) {
kvmppc_init(); kvmppc_init();