From: Eduardo Habkost <ehabkost@redhat.com>
Date: Wed, 16 Dec 2015 19:06:43 +0000 (-0200)
Subject: target-i386: kvm: Increase MSR_BUF_SIZE
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d1138251bf712cc076cdbbfd68aae3c8792bfcf9;p=qemu.git

target-i386: kvm: Increase MSR_BUF_SIZE

We are dangerously close to the array limits in kvm_put_msrs()
and kvm_get_msrs(): with the default mcg_cap configuration, we
can set up to 148 MSRs in kvm_put_msrs(), and if we allow mcg_cap
to be changed, we can write up to 236 MSRs.

Use 4096 bytes for the buffer, that can hold 255 kvm_msr_entry
structs.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 7ad9c32326..1c20e3ce5b 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -57,8 +57,9 @@
 #define MSR_KVM_WALL_CLOCK  0x11
 #define MSR_KVM_SYSTEM_TIME 0x12
 
-#define MSR_BUF_SIZE \
-    (sizeof(struct kvm_msrs) + 150 * sizeof(struct kvm_msr_entry))
+/* A 4096-byte buffer can hold the 8-byte kvm_msrs header, plus
+ * 255 kvm_msr_entry structs */
+#define MSR_BUF_SIZE 4096
 
 #ifndef BUS_MCEERR_AR
 #define BUS_MCEERR_AR 4