Signed-off-by: Marcelo Tosatti <[EMAIL PROTECTED]>

Index: kvm/arch/x86/kvm/x86.c
===================================================================
--- kvm.orig/arch/x86/kvm/x86.c
+++ kvm/arch/x86/kvm/x86.c
@@ -27,6 +27,7 @@
 #include <linux/module.h>
 #include <linux/mman.h>
 #include <linux/highmem.h>
+#include <linux/acpi_pmtmr.h>
 
 #include <asm/uaccess.h>
 #include <asm/msr.h>
@@ -1765,13 +1766,18 @@ static void kvm_init_msr_list(void)
 
 static int kvm_init_ioport_list(void)
 {
-       allowed_open_ioports = kmalloc(sizeof(struct kvm_ioport) +
+       allowed_open_ioports = kmalloc(sizeof(struct kvm_ioport) * 2 +
                                       sizeof(struct kvm_ioport_list), 
GFP_KERNEL);
        if (!allowed_open_ioports)
                return -ENOMEM;
        allowed_open_ioports->nranges = 1;
        allowed_open_ioports->ioports[0].addr = 0x80;
        allowed_open_ioports->ioports[0].len = 1;
+       if (pmtmr_ioport) {
+               allowed_open_ioports->nranges++;
+               allowed_open_ioports->ioports[1].addr = pmtmr_ioport;
+               allowed_open_ioports->ioports[1].len = 4;
+       }
 
        return 0;
 }

-- 

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to