mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
Remove some vmx header files from Xen public interfaces.
They are not public. Signed-off-by: Keir Fraser <keir@xensource.com>
This commit is contained in:
kaf24@firebug.cl.cam.ac.uk committed
1 parent
c235fe27ec
commit
4e92c9cd0f
9 files changed
+10
-69
No files matched your search
@@ -31,7 +31,7 @@
|
||||
#include <xen/sched.h>
|
||||
#include <public/io/ioreq.h>
|
||||
#include <asm/vmx.h>
|
||||
#include <public/io/vmx_vpic.h>
|
||||
#include <asm/vmx_vpic.h>
|
||||
#include <asm/current.h>
|
||||
#include <asm/vmx_vioapic.h>
|
||||
#include <asm/vmx_vlapic.h>
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
#include <xen/sched.h>
|
||||
#include <public/io/ioreq.h>
|
||||
#include <asm/vmx.h>
|
||||
#include <public/io/vmx_vpic.h>
|
||||
#include <asm/vmx_vpic.h>
|
||||
#include <asm/current.h>
|
||||
|
||||
static void ioapic_enable(vmx_vioapic_t *s, uint8_t enable)
|
||||
|
||||
+2
-2
@@ -43,8 +43,8 @@
|
||||
#endif
|
||||
#include <public/sched.h>
|
||||
#include <public/io/ioreq.h>
|
||||
#include <public/io/vmx_vpic.h>
|
||||
#include <public/io/vmx_vlapic.h>
|
||||
#include <asm/vmx_vpic.h>
|
||||
#include <asm/vmx_vlapic.h>
|
||||
|
||||
int hvm_enabled;
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <xen/types.h>
|
||||
#include <asm/vmx.h>
|
||||
#include <asm/vmx_platform.h>
|
||||
#include <asm/vmx_virpit.h>
|
||||
#include <asm/vmx_vpit.h>
|
||||
#include <asm/vmx_intercept.h>
|
||||
#include <asm/vmx_vlapic.h>
|
||||
#include <public/io/ioreq.h>
|
||||
|
||||
@@ -32,13 +32,12 @@
|
||||
#include <asm/vmx.h>
|
||||
#include <asm/vmx_vmcs.h>
|
||||
#include <asm/vmx_platform.h>
|
||||
#include <asm/vmx_virpit.h>
|
||||
#include <asm/vmx_vpit.h>
|
||||
#include <asm/apic.h>
|
||||
#include <asm/shadow.h>
|
||||
|
||||
#include <asm/vmx_vpic.h>
|
||||
#include <asm/vmx_vlapic.h>
|
||||
#include <public/io/ioreq.h>
|
||||
#include <public/io/vmx_vpic.h>
|
||||
|
||||
#ifdef CONFIG_VMX
|
||||
#if defined (__i386__)
|
||||
|
||||
@@ -22,10 +22,10 @@
|
||||
|
||||
#include <public/xen.h>
|
||||
#include <asm/e820.h>
|
||||
#include <asm/vmx_virpit.h>
|
||||
#include <asm/vmx_vpit.h>
|
||||
#include <asm/vmx_intercept.h>
|
||||
#include <asm/vmx_vioapic.h>
|
||||
#include <public/io/vmx_vpic.h>
|
||||
#include <asm/vmx_vpic.h>
|
||||
|
||||
#define MAX_OPERAND_NUM 2
|
||||
|
||||
|
||||
File renamed without changes.
@@ -8,7 +8,7 @@
|
||||
#include <xen/errno.h>
|
||||
#include <xen/ac_timer.h>
|
||||
#include <asm/vmx_vmcs.h>
|
||||
#include <public/io/vmx_vpic.h>
|
||||
#include <asm/vmx_vpic.h>
|
||||
|
||||
#define PIT_FREQ 1193181
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
#ifndef _VMX_VLAPIC_H
|
||||
#define _VMX_VLAPIC_H
|
||||
|
||||
/*
|
||||
We extended one bit for PIC type
|
||||
*/
|
||||
#define VLAPIC_DELIV_MODE_FIXED 0x0
|
||||
#define VLAPIC_DELIV_MODE_LPRI 0x1
|
||||
#define VLAPIC_DELIV_MODE_SMI 0x2
|
||||
#define VLAPIC_DELIV_MODE_NMI 0x4
|
||||
#define VLAPIC_DELIV_MODE_INIT 0x5
|
||||
#define VLAPIC_DELIV_MODE_STARTUP 0x6
|
||||
#define VLAPIC_DELIV_MODE_EXT 0x7
|
||||
#define VLAPIC_DELIV_MODE_MASK 0x8
|
||||
|
||||
#define VLAPIC_MSG_LEVEL 4
|
||||
|
||||
#define INTR_EXT 0
|
||||
#define INTR_APIC 1
|
||||
#define INTR_LAPIC 2
|
||||
|
||||
#define VL_STATE_EOI 1
|
||||
#define VL_STATE_EXT_LOCK 2
|
||||
#define VL_STATE_MSG_LOCK 3
|
||||
#define VL_STATE_EOI_LOCK 3
|
||||
|
||||
#define VLOCAL_APIC_MAX_INTS 256
|
||||
#define VLAPIC_INT_COUNT (VLOCAL_APIC_MAX_INTS/(BITS_PER_BYTE * sizeof(uint64_t)))
|
||||
#define VLAPIC_INT_COUNT_32 (VLOCAL_APIC_MAX_INTS/(BITS_PER_BYTE * sizeof(uint32_t)))
|
||||
|
||||
typedef struct {
|
||||
/* interrupt for PIC and ext type IOAPIC interrupt */
|
||||
uint64_t vl_ext_intr[VLAPIC_INT_COUNT];
|
||||
uint64_t vl_ext_intr_mask[VLAPIC_INT_COUNT];
|
||||
uint64_t vl_apic_intr[VLAPIC_INT_COUNT];
|
||||
uint64_t vl_apic_tmr[VLAPIC_INT_COUNT];
|
||||
uint64_t vl_eoi[VLAPIC_INT_COUNT];
|
||||
uint32_t vl_lapic_id;
|
||||
uint32_t direct_intr;
|
||||
uint32_t vl_apr;
|
||||
uint32_t vl_logical_dest;
|
||||
uint32_t vl_dest_format;
|
||||
uint32_t vl_arb_id;
|
||||
uint32_t vl_state;
|
||||
uint32_t apic_msg_count;
|
||||
} vlapic_info;
|
||||
|
||||
#endif /* _VMX_VLAPIC_H_ */
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* mode: C
|
||||
* c-set-style: "BSD"
|
||||
* c-basic-offset: 4
|
||||
* tab-width: 4
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*/
|
||||