[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 02/39] alpha: use generic cpu_model parsing
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL v2 02/39] alpha: use generic cpu_model parsing |
Date: |
Fri, 27 Oct 2017 16:20:30 +0200 |
From: Igor Mammedov <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
Acked-by: Richard Henderson <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/alpha/dp264.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 1b121306c2..babd6ea514 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -51,7 +51,6 @@ static int clipper_pci_map_irq(PCIDevice *d, int irq_num)
static void clipper_init(MachineState *machine)
{
ram_addr_t ram_size = machine->ram_size;
- const char *cpu_model = machine->cpu_model ? machine->cpu_model : "ev67";
const char *kernel_filename = machine->kernel_filename;
const char *kernel_cmdline = machine->kernel_cmdline;
const char *initrd_filename = machine->initrd_filename;
@@ -67,7 +66,7 @@ static void clipper_init(MachineState *machine)
/* Create up to 4 cpus. */
memset(cpus, 0, sizeof(cpus));
for (i = 0; i < smp_cpus; ++i) {
- cpus[i] = ALPHA_CPU(cpu_generic_init(TYPE_ALPHA_CPU, cpu_model));
+ cpus[i] = ALPHA_CPU(cpu_create(machine->cpu_type));
}
cpus[0]->env.trap_arg0 = ram_size;
@@ -179,6 +178,7 @@ static void clipper_machine_init(MachineClass *mc)
mc->block_default_type = IF_IDE;
mc->max_cpus = 4;
mc->is_default = 1;
+ mc->default_cpu_type = ALPHA_CPU_TYPE_NAME("ev67");
}
DEFINE_MACHINE("clipper", clipper_machine_init)
--
2.13.6
- [Qemu-devel] [PULL v2 00/39] x86/cpu/numa queue, 2017-10-27, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 01/39] alpha: cleanup cpu type name composition, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 02/39] alpha: use generic cpu_model parsing,
Eduardo Habkost <=
- [Qemu-devel] [PULL v2 03/39] cris: cleanup cpu type name composition, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 04/39] cris: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 05/39] lm32: cleanup cpu type name composition, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 06/39] lm32: milkymist: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 07/39] lm32: lm32_boards: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 08/39] m68k: cleanup cpu type name composition, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 09/39] m68k: an5206: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 10/39] m68k: mcf5208: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 11/39] moxie: fix qemu-system-moxie failing to start with CLI "-cpu MoxieLite", Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 12/39] moxie: cleanup cpu type name composition, Eduardo Habkost, 2017/10/27