Commit e01a1b57 authored by Hollis Blanchard's avatar Hollis Blanchard Committed by Avi Kivity
Browse files

KVM: Portability: Stop including x86-specific headers in kvm_main.c 



Signed-off-by: default avatarHollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent e2174021

drivers/kvm/i8259.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
 */

#include <linux/mm.h>

#include "irq.h"

#include "kvm.h"



/*

 * set irq level. If an edge is detected, then the IRR is set to 1

drivers/kvm/irq.h

+6 −1
Original line number Diff line number Diff line
@@ -22,9 +22,14 @@ 
#ifndef __IRQ_H

#define __IRQ_H



#include "kvm.h"

#include <linux/mm_types.h>

#include <linux/hrtimer.h>

#include <asm/kvm.h>

#include "iodev.h"



struct kvm;

struct kvm_vcpu;



typedef void irq_request_func(void *opaque, int level);



struct kvm_kpic_state {

drivers/kvm/kvm.h

+4 −5
Original line number Diff line number Diff line
@@ -288,11 +288,6 @@ static inline int irqchip_in_kernel(struct kvm *kvm) 
	return pic_irqchip(kvm) != NULL;

}



struct descriptor_table {

	u16 limit;

	unsigned long base;

} __attribute__((packed));



/* The guest did something we don't support. */

#define pr_unimpl(vcpu, fmt, ...)					\

 do {									\
@@ -457,4 +452,8 @@ struct kvm_stats_debugfs_item { 
};

extern struct kvm_stats_debugfs_item debugfs_entries[];



#if defined(CONFIG_X86)

#include "x86.h"

#endif



#endif

drivers/kvm/kvm_main.c

+0 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
 */



#include "kvm.h"

#include "x86.h"

#include "irq.h"

#include "iodev.h"



#include <linux/kvm.h>
@@ -46,7 +44,6 @@ 
#include <asm/processor.h>

#include <asm/io.h>

#include <asm/uaccess.h>

#include <asm/desc.h>

#include <asm/pgtable.h>



MODULE_AUTHOR("Qumranet");

drivers/kvm/x86.h

+8 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#define KVM_X86_H



#include "kvm.h"

#include "irq.h"



#include <linux/types.h>

#include <linux/mm.h>
@@ -19,6 +20,8 @@ 
#include <linux/kvm.h>

#include <linux/kvm_para.h>



#include <asm/desc.h>



#define CR3_PAE_RESERVED_BITS ((X86_CR3_PWT | X86_CR3_PCD) - 1)

#define CR3_NONPAE_RESERVED_BITS ((PAGE_SIZE-1) & ~(X86_CR3_PWT | X86_CR3_PCD))

#define CR3_L_MODE_RESERVED_BITS (CR3_NONPAE_RESERVED_BITS|0xFFFFFF0000000000ULL)
@@ -156,6 +159,11 @@ struct kvm_vcpu { 
	struct x86_emulate_ctxt emulate_ctxt;

};



struct descriptor_table {

	u16 limit;

	unsigned long base;

} __attribute__((packed));



struct kvm_x86_ops {

	int (*cpu_has_kvm_support)(void);          /* __init */

	int (*disabled_by_bios)(void);             /* __init */