| Message ID | 1357870231-26762-18-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Jan 11, 2013 at 03:10:31AM +0100, Igor Mammedov wrote: > Setting tsc-frequency from x86_def_t is NOP because default tsc_khz > in x86_def_t is 0 and CPUX86State.tsc_khz is also initialized to 0 > by default. So there is not need to set ovewrite tsc_khz with default > 0 because field was already initialized to 0. > > custom tsc-frequency setting is not affected due to it is being set > without using x86_def_t (previous patch) > > Field tsc_khz in x86_def_t becomes unused with this patch, so drop it > as well. > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > --- > v2: > - rebased with "target-i386: move out CPU features initialization > in separate func" patch dropped > --- > target-i386/cpu.c | 3 --- > 1 files changed, 0 insertions(+), 3 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index c3e1792..af93673 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -357,7 +357,6 @@ typedef struct x86_def_t { > int family; > int model; > int stepping; > - int tsc_khz; > uint32_t features, ext_features, ext2_features, ext3_features; > uint32_t kvm_features, svm_features; > uint32_t xlevel; > @@ -1579,8 +1578,6 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) > 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); > > object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error); > x86_cpu_set_props(cpu, props, &error); > -- > 1.7.1 > >
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index c3e1792..af93673 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -357,7 +357,6 @@ typedef struct x86_def_t { int family; int model; int stepping; - int tsc_khz; uint32_t features, ext_features, ext2_features, ext3_features; uint32_t kvm_features, svm_features; uint32_t xlevel; @@ -1579,8 +1578,6 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) 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); object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error); x86_cpu_set_props(cpu, props, &error);
Setting tsc-frequency from x86_def_t is NOP because default tsc_khz in x86_def_t is 0 and CPUX86State.tsc_khz is also initialized to 0 by default. So there is not need to set ovewrite tsc_khz with default 0 because field was already initialized to 0. custom tsc-frequency setting is not affected due to it is being set without using x86_def_t (previous patch) Field tsc_khz in x86_def_t becomes unused with this patch, so drop it as well. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- v2: - rebased with "target-i386: move out CPU features initialization in separate func" patch dropped --- target-i386/cpu.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)