[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/17] target-i386: cpu_x86_register(): reorder CPU
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 08/17] target-i386: cpu_x86_register(): reorder CPU property setting |
Date: |
Mon, 12 Nov 2012 19:38:53 -0200 |
Trivial code movement, before moving the code to another function.
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 9334e0c..7f4e8f0 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1448,18 +1448,19 @@ static int cpu_x86_register(X86CPU *cpu, const char
*cpu_model, Error **errp)
object_property_set_int(OBJECT(cpu), def->family, "family", &error);
object_property_set_int(OBJECT(cpu), def->model, "model", &error);
object_property_set_int(OBJECT(cpu), def->stepping, "stepping", &error);
+ object_property_set_int(OBJECT(cpu), def->xlevel, "xlevel", &error);
+ object_property_set_int(OBJECT(cpu), (int64_t)def->tsc_khz * 1000,
+ "tsc-frequency", &error);
+ object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error);
env->cpuid_features = def->features;
env->cpuid_ext_features = def->ext_features;
env->cpuid_ext2_features = def->ext2_features;
env->cpuid_ext3_features = def->ext3_features;
- object_property_set_int(OBJECT(cpu), def->xlevel, "xlevel", &error);
env->cpuid_kvm_features = def->kvm_features;
env->cpuid_svm_features = def->svm_features;
env->cpuid_ext4_features = def->ext4_features;
env->cpuid_7_0_ebx_features = def->cpuid_7_0_ebx_features;
env->cpuid_xlevel2 = def->xlevel2;
- object_property_set_int(OBJECT(cpu), (int64_t)def->tsc_khz * 1000,
- "tsc-frequency", &error);
/* On AMD CPUs, some CPUID[8000_0001].EDX bits must match the bits on
* CPUID[1].EDX.
@@ -1486,7 +1487,6 @@ static int cpu_x86_register(X86CPU *cpu, const char
*cpu_model, Error **errp)
filter_features_for_kvm(cpu);
#endif
}
- object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error);
if (error) {
error_propagate(errp, error);
return -1;
--
1.7.11.7
- [Qemu-devel] [PATCH 04/17] target-i386: x86_cpudef_setup(): cosmetic change on comment, (continued)
- [Qemu-devel] [PATCH 04/17] target-i386: x86_cpudef_setup(): cosmetic change on comment, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 01/17] target-i386/cpu.c: coding style fix, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 03/17] target-i386: cpu: rename x86_def_t to X86CPUDefinition, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 02/17] target-i386: move cpu_x86_init() to cpu.c, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 05/17] target-i386: cpu_x86_init(): move error handling to end of function, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 06/17] target-i386: cpu_x86_init(): print error message in case of error, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 09/17] target-i386: move out CPU features initialization to separate func, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 10/17] target-i386: kill cpu_x86_register(), Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 12/17] target-i386: cpu_x86_find_by_name(): split CPU model and feature string first, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 14/17] target-i386: cpu_x86_init(): rename cpu_model to cpu_string, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 08/17] target-i386: cpu_x86_register(): reorder CPU property setting,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 15/17] target-i386: cpu_x86_init(): eliminate extra 'def1' variable, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 11/17] target-i386: return Error from cpu_x86_find_by_name(), Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 07/17] target-i386: cpu_x86_register(): report errors using Error parameter, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 13/17] target-i386: cpu: create cpu_x86_find_cpudef() function, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 17/17] target-i386: cpu_x86_init(): reorder split of CPU string and creation of CPU object, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 16/17] target-i386: cpu: separate cpudef lookup from feature string parsing, Eduardo Habkost, 2012/11/12