[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/5] target-i386: Remove has_msr_mtrr global variabl
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 1/5] target-i386: Remove has_msr_mtrr global variable |
Date: |
Mon, 26 Sep 2016 19:24:06 -0300 |
The global variable is not necessary because we can check the CPU
feature flags directly.
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/kvm.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index a0e42b2..5118562 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -99,7 +99,6 @@ static bool has_msr_hv_vpindex;
static bool has_msr_hv_runtime;
static bool has_msr_hv_synic;
static bool has_msr_hv_stimer;
-static bool has_msr_mtrr;
static bool has_msr_xss;
static bool has_msr_architectural_pmu;
@@ -975,9 +974,6 @@ int kvm_arch_init_vcpu(CPUState *cs)
}
cpu->kvm_msr_buf = g_malloc0(MSR_BUF_SIZE);
- if (env->features[FEAT_1_EDX] & CPUID_MTRR) {
- has_msr_mtrr = true;
- }
if (!(env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_RDTSCP)) {
has_msr_tsc_aux = false;
}
@@ -1735,7 +1731,7 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
env->msr_hv_stimer_count[j]);
}
}
- if (has_msr_mtrr) {
+ if (env->features[FEAT_1_EDX] & CPUID_MTRR) {
uint64_t phys_mask = MAKE_64BIT_MASK(0, cpu->phys_bits);
kvm_msr_entry_add(cpu, MSR_MTRRdefType, env->mtrr_deftype);
@@ -2125,7 +2121,7 @@ static int kvm_get_msrs(X86CPU *cpu)
kvm_msr_entry_add(cpu, msr, 0);
}
}
- if (has_msr_mtrr) {
+ if (env->features[FEAT_1_EDX] & CPUID_MTRR) {
kvm_msr_entry_add(cpu, MSR_MTRRdefType, 0);
kvm_msr_entry_add(cpu, MSR_MTRRfix64K_00000, 0);
kvm_msr_entry_add(cpu, MSR_MTRRfix16K_80000, 0);
--
2.7.4
- [Qemu-devel] [PATCH 0/5] target-i386: Eliminate unnecessary has_msr_* global variables, Eduardo Habkost, 2016/09/26
- [Qemu-devel] [PATCH 1/5] target-i386: Remove has_msr_mtrr global variable,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 2/5] target-i386: Remove has_msr_hv_apic global variable, Eduardo Habkost, 2016/09/26
- [Qemu-devel] [PATCH 3/5] target-i386: Remove has_msr_hv_tsc global variable, Eduardo Habkost, 2016/09/26
- [Qemu-devel] [PATCH 4/5] target-i386: Clear KVM CPUID features if KVM is disabled, Eduardo Habkost, 2016/09/26
- [Qemu-devel] [PATCH 5/5] target-i386: Remove has_msr_* global vars for KVM features, Eduardo Habkost, 2016/09/26
- Re: [Qemu-devel] [PATCH 0/5] target-i386: Eliminate unnecessary has_msr_* global variables, Paolo Bonzini, 2016/09/27