[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/12] target-arm: Add feature parsing to virt
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 06/12] target-arm: Add feature parsing to virt |
Date: |
Fri, 13 Feb 2015 05:54:39 +0000 |
From: Greg Bellows <address@hidden>
Added machvirt parsing of feature keywords added to the -cpu command line
option. Parsing occurs during machine initialization.
Signed-off-by: Greg Bellows <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/arm/virt.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ee77093..69f51ac 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -728,15 +728,19 @@ static void machvirt_init(MachineState *machine)
const char *cpu_model = machine->cpu_model;
VirtBoardInfo *vbi;
uint32_t gic_phandle;
+ char **cpustr;
if (!cpu_model) {
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) {
- error_report("mach-virt: CPU %s not supported", cpu_model);
+ error_report("mach-virt: CPU %s not supported", cpustr[0]);
exit(1);
}
@@ -750,8 +754,10 @@ static void machvirt_init(MachineState *machine)
create_fdt(vbi);
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;
+ Error *err = NULL;
if (!oc) {
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));
+ /* 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) {
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);
}
+ g_strfreev(cpustr);
fdt_add_timer_nodes(vbi);
fdt_add_cpu_nodes(vbi);
fdt_add_psci_node(vbi);
--
1.9.1
- [Qemu-devel] [PULL 09/12] target-arm: A64: Fix shifts into sign bit, (continued)
- [Qemu-devel] [PULL 09/12] target-arm: A64: Fix shifts into sign bit, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 11/12] target-arm: A64: Avoid left shifting negative integers in disas_pc_rel_addr, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 10/12] target-arm: A64: Fix handling of rotate in logic_imm_decode_wmask, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 08/12] target-arm: Add AArch32 guest support to KVM64, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 05/12] target-arm: Add CPU property to disable AArch64, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 04/12] pci: Move PCI VGA to pci.mak, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 01/12] pci: Allocate PCIe host bridge PCI ID, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 03/12] arm: Add PCIe host bridge in virt machine, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 02/12] pci: Add generic PCIe host bridge, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 12/12] target-arm: A64: Avoid signed shifts in disas_ldst_pair(), Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 06/12] target-arm: Add feature parsing to virt,
Peter Maydell <=
- [Qemu-devel] [PULL 07/12] target-arm: Add 32/64-bit register sync, Peter Maydell, 2015/02/13
- Re: [Qemu-devel] [PULL 00/12] target-arm queue, Peter Maydell, 2015/02/13
- Re: [Qemu-devel] [PULL 00/12] target-arm queue, Peter Maydell, 2015/02/13