get rid of MSR_COUNT

Commit Message

Glauber Costa Oct. 15, 2009, 8:26 p.m. UTC

None

Patch

diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index c8e37ed..350e5fd 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -808,12 +808,6 @@  static int get_msr_entry(struct kvm_msr_entry *entry, CPUState *env)
         return 0;
 }
 
-#ifdef TARGET_X86_64
-#define MSR_COUNT 9
-#else
-#define MSR_COUNT 5
-#endif
-
 static void set_v8086_seg(struct kvm_segment *lhs, const SegmentCache *rhs)
 {
     lhs->selector = rhs->selector;
@@ -868,7 +862,7 @@  void kvm_arch_load_regs(CPUState *env)
     struct kvm_regs regs;
     struct kvm_fpu fpu;
     struct kvm_sregs sregs;
-    struct kvm_msr_entry msrs[MSR_COUNT];
+    struct kvm_msr_entry msrs[100];
     int rc, n, i;
 
     regs.rax = env->regs[R_EAX];
@@ -1021,7 +1015,7 @@  void kvm_arch_save_regs(CPUState *env)
     struct kvm_regs regs;
     struct kvm_fpu fpu;
     struct kvm_sregs sregs;
-    struct kvm_msr_entry msrs[MSR_COUNT];
+    struct kvm_msr_entry msrs[100];
     uint32_t hflags;
     uint32_t i, n, rc;