[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/16] arm: virt: Parse cpu_model only once
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 10/16] arm: virt: Parse cpu_model only once |
Date: |
Thu, 7 Jul 2016 16:59:16 -0300 |
From: Igor Mammedov <address@hidden>
Considering that features are converted to global properties and
global properties are automatically applied to every new instance
of created CPU (at object_new() time), there is no point in
parsing cpu_model string every time a CPU created. So move
parsing outside CPU creation loop and do it only once.
Parsing also should be done before any CPU is created so that
features would affect the first CPU a well.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/arm/virt.c | 42 +++++++++++++++++++++---------------------
qom/cpu.c | 1 -
2 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ae90ca5..4dafd42 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1176,6 +1176,10 @@ static void machvirt_init(MachineState *machine)
VirtGuestInfoState *guest_info_state = g_malloc0(sizeof *guest_info_state);
VirtGuestInfo *guest_info = &guest_info_state->info;
char **cpustr;
+ ObjectClass *oc;
+ const char *typename;
+ CPUClass *cc;
+ Error *err = NULL;
bool firmware_loaded = bios_name || drive_get(IF_PFLASH, 0, 0);
if (!cpu_model) {
@@ -1259,27 +1263,24 @@ 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, cpustr[0]);
- const char *typename = object_class_get_name(oc);
- CPUClass *cc = CPU_CLASS(oc);
- Object *cpuobj;
- Error *err = NULL;
- char *cpuopts = g_strdup(cpustr[1]);
-
- if (!oc) {
- error_report("Unable to find CPU definition");
- exit(1);
- }
- /* convert -smp CPU options specified by the user into global props */
- cc->parse_features(typename, cpuopts, &err);
- cpuobj = object_new(typename);
+ oc = cpu_class_by_name(TYPE_ARM_CPU, cpustr[0]);
+ if (!oc) {
+ error_report("Unable to find CPU definition");
+ exit(1);
+ }
+ typename = object_class_get_name(oc);
- g_free(cpuopts);
- if (err) {
- error_report_err(err);
- exit(1);
- }
+ /* convert -smp CPU options specified by the user into global props */
+ cc = CPU_CLASS(oc);
+ cc->parse_features(typename, cpustr[1], &err);
+ g_strfreev(cpustr);
+ if (err) {
+ error_report_err(err);
+ exit(1);
+ }
+
+ for (n = 0; n < smp_cpus; n++) {
+ Object *cpuobj = object_new(typename);
if (!vms->secure) {
object_property_set_bool(cpuobj, false, "has_el3", NULL);
@@ -1310,7 +1311,6 @@ static void machvirt_init(MachineState *machine)
object_property_set_bool(cpuobj, true, "realized", NULL);
}
- g_strfreev(cpustr);
fdt_add_timer_nodes(vbi, gic_version);
fdt_add_cpu_nodes(vbi);
fdt_add_psci_node(vbi);
diff --git a/qom/cpu.c b/qom/cpu.c
index 2a0d9fe..f884a66 100644
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -296,7 +296,6 @@ static void cpu_common_parse_features(const char *typename,
char *features,
* call it only once, so we can remove this check (or change it
* to assert(!cpu_globals_initialized).
* Current callers of ->parse_features() are:
- * - machvirt_init()
* - cpu_generic_init()
* - cpu_x86_create()
*/
--
2.5.5
- [Qemu-devel] [PULL 01/16] qdev: Don't stop applying globals on first error, (continued)
- [Qemu-devel] [PULL 01/16] qdev: Don't stop applying globals on first error, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 02/16] qdev: Eliminate qemu_add_globals() function, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 04/16] machine: Add machine_register_compat_props() function, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 03/16] qdev: GlobalProperty.errp field, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 05/16] vl: Set errp to &error_abort on machine compat_props, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 06/16] target-sparc: Use sparc_cpu_parse_features() directly, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 07/16] target-i386: TCG can support CPUID.07H:EBX.erms, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 08/16] target-i386: Avoid using locals outside their scope, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 09/16] cpu: Use CPUClass->parse_features() as convertor to global properties, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 11/16] pc: Parse CPU features only once, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 10/16] arm: virt: Parse cpu_model only once,
Eduardo Habkost <=
- [Qemu-devel] [PULL 15/16] target-i386: Publish advised value of MSR_IA32_FEATURE_CONTROL via fw_cfg, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 12/16] target-i386: Show host and VM TSC frequencies on mismatch, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 13/16] target-i386: Report hyperv feature words through qom, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 14/16] target-i386: kvm: Add basic Intel LMCE support, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 16/16] target-i386: Enable LMCE for '-cpu host' if supported by host, Eduardo Habkost, 2016/07/07
- Re: [Qemu-devel] [PULL 00/16] x86 and machine queue, 2016-07-07, Peter Maydell, 2016/07/11