[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/15] target-i386: Introduce "tsc-frequency" proper
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 15/15] target-i386: Introduce "tsc-frequency" property for X86CPU |
Date: |
Wed, 18 Apr 2012 01:11:19 +0200 |
Use Hz as unit.
Signed-off-by: Andreas Färber <address@hidden>
---
target-i386/cpu.c | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 1ece541..f26253f 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -857,6 +857,37 @@ static void x86_cpuid_set_model_id(Object *obj, const char
*model_id,
}
}
+static void x86_cpuid_get_tsc_freq(Object *obj, Visitor *v, void *opaque,
+ const char *name, Error **errp)
+{
+ X86CPU *cpu = X86_CPU(obj);
+ int64_t value;
+
+ value = cpu->env.tsc_khz * 1000;
+ visit_type_int(v, &value, name, errp);
+}
+
+static void x86_cpuid_set_tsc_freq(Object *obj, Visitor *v, void *opaque,
+ const char *name, Error **errp)
+{
+ X86CPU *cpu = X86_CPU(obj);
+ const int64_t min = 0;
+ const int64_t max = INT_MAX;
+ int64_t value;
+
+ visit_type_int(v, &value, name, errp);
+ if (error_is_set(errp)) {
+ return;
+ }
+ if (value < min || value > max) {
+ error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "",
+ name ? name : "null", value, min, max);
+ return;
+ }
+
+ cpu->env.tsc_khz = value / 1000;
+}
+
static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model)
{
unsigned int i;
@@ -1157,7 +1188,8 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
env->cpuid_svm_features = def->svm_features;
env->cpuid_ext4_features = def->ext4_features;
env->cpuid_xlevel2 = def->xlevel2;
- env->tsc_khz = def->tsc_khz;
+ object_property_set_int(OBJECT(cpu), (int64_t)def->tsc_khz * 1000,
+ "tsc-frequency", &error);
if (!kvm_enabled()) {
env->cpuid_features &= TCG_FEATURES;
env->cpuid_ext_features &= TCG_EXT_FEATURES;
@@ -1719,6 +1751,9 @@ static void x86_cpu_initfn(Object *obj)
object_property_add_str(obj, "model-id",
x86_cpuid_get_model_id,
x86_cpuid_set_model_id, NULL);
+ object_property_add(obj, "tsc-frequency", "int",
+ x86_cpuid_get_tsc_freq,
+ x86_cpuid_set_tsc_freq, NULL, NULL, NULL);
env->cpuid_apic_id = env->cpu_index;
mce_init(cpu);
--
1.7.7
- [Qemu-devel] [PATCH 02/15] target-i386: Pass X86CPU to cpu_x86_register(), (continued)
- [Qemu-devel] [PATCH 02/15] target-i386: Pass X86CPU to cpu_x86_register(), Andreas Färber, 2012/04/17
- [Qemu-devel] [PATCH 12/15] target-i386: Introduce "level" property for X86CPU, Andreas Färber, 2012/04/17
- [Qemu-devel] [PATCH 04/15] target-i386: Add "family" property to X86CPU, Andreas Färber, 2012/04/17
- [Qemu-devel] [PATCH 03/15] target-i386: Add range check for -cpu , family=x, Andreas Färber, 2012/04/17
- [Qemu-devel] [PATCH 06/15] target-i386: Add "stepping" property to X86CPU, Andreas Färber, 2012/04/17
- [Qemu-devel] [PATCH 13/15] target-i386: Introduce "xlevel" property for X86CPU, Andreas Färber, 2012/04/17
- [Qemu-devel] [PATCH 05/15] target-i386: Add "model" property to X86CPU, Andreas Färber, 2012/04/17
- [Qemu-devel] [PATCH 14/15] target-i386: Prepare "vendor" property for X86CPU, Andreas Färber, 2012/04/17
- [Qemu-devel] [PATCH 15/15] target-i386: Introduce "tsc-frequency" property for X86CPU,
Andreas Färber <=
- [Qemu-devel] [PATCH 11/15] target-i386: Add property getter for CPU model-id, Andreas Färber, 2012/04/17
- [Qemu-devel] [PATCH 08/15] target-i386: Add property getter for CPU family, Andreas Färber, 2012/04/17
- [Qemu-devel] [PATCH 07/15] target-i386: Add "model-id" property to X86CPU, Andreas Färber, 2012/04/17
- [Qemu-devel] [PATCH 09/15] target-i386: Add property getter for CPU model, Andreas Färber, 2012/04/17
- Re: [Qemu-devel] [PATCH 00/15] QOM'ify x86 CPU, part 2: properties, Eduardo Habkost, 2012/04/19