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

target-arm: Add feature parsing to virt

Browse Source 
Added machvirt parsing of feature keywords added to the -cpu command line
option.  Parsing occurs during machine initialization.

Signed-off-by: Greg Bellows <greg.bellows@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1423736974-14254-3-git-send-email-greg.bellows@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Greg Bellows 2015-02-13 05:46:08 +00:00 committed by Peter Maydell
parent fb8d6c24b0
commit f313369fdb
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/arm/virt.c
View File

@ -728,15 +728,19 @@ static void machvirt_init(MachineState *machine)
const char *cpu_model = machine->cpu_model; const char *cpu_model = machine->cpu_model;
VirtBoardInfo *vbi; VirtBoardInfo *vbi;
uint32_t gic_phandle; uint32_t gic_phandle;
char **cpustr;
if (!cpu_model) { if (!cpu_model) {
cpu_model = "cortex-a15"; cpu_model = "cortex-a15";
} }
vbi = find_machine_info(cpu_model); /* Separate the actual CPU model name from any appended features */
cpustr = g_strsplit(cpu_model, ",", 2);
vbi = find_machine_info(cpustr[0]);
if (!vbi) { if (!vbi) {
error_report("mach-virt: CPU %s not supported", cpu_model); error_report("mach-virt: CPU %s not supported", cpustr[0]);
exit(1); exit(1);
} }
@ -750,8 +754,10 @@ static void machvirt_init(MachineState *machine)
create_fdt(vbi); create_fdt(vbi);
for (n = 0; n < smp_cpus; n++) { for (n = 0; n < smp_cpus; n++) {
ObjectClass *oc = cpu_class_by_name(TYPE_ARM_CPU, cpu_model); ObjectClass *oc = cpu_class_by_name(TYPE_ARM_CPU, cpustr[0]);
CPUClass *cc = CPU_CLASS(oc);
Object *cpuobj; Object *cpuobj;
Error *err = NULL;
if (!oc) { if (!oc) {
fprintf(stderr, "Unable to find CPU definition\n"); fprintf(stderr, "Unable to find CPU definition\n");
@ -759,6 +765,13 @@ static void machvirt_init(MachineState *machine)
} }
cpuobj = object_new(object_class_get_name(oc)); cpuobj = object_new(object_class_get_name(oc));
/* Handle any CPU options specified by the user */
cc->parse_features(CPU(cpuobj), cpustr[1], &err);
if (err) {
error_report("%s", error_get_pretty(err));
exit(1);
}
if (!vms->secure) { if (!vms->secure) {
object_property_set_bool(cpuobj, false, "has_el3", NULL); object_property_set_bool(cpuobj, false, "has_el3", NULL);
} }
@ -778,6 +791,7 @@ static void machvirt_init(MachineState *machine)
object_property_set_bool(cpuobj, true, "realized", NULL); object_property_set_bool(cpuobj, true, "realized", NULL);
} }
g_strfreev(cpustr);
fdt_add_timer_nodes(vbi); fdt_add_timer_nodes(vbi);
fdt_add_cpu_nodes(vbi); fdt_add_cpu_nodes(vbi);
fdt_add_psci_node(vbi); fdt_add_psci_node(vbi);