|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] Remove CONFIG_VMX and CONFIG_SVM compile options. Support
# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 707cb68a391f26f41e0f272b35c3374bc495a6ff
# Parent f030f4b565a57b0ebe3461fad7ed52193ec880b6
Remove CONFIG_VMX and CONFIG_SVM compile options. Support
will always be compiled into Xen.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
diff -r f030f4b565a5 -r 707cb68a391f xen/arch/x86/cpu/amd.c
--- a/xen/arch/x86/cpu/amd.c Mon Feb 6 22:25:31 2006
+++ b/xen/arch/x86/cpu/amd.c Mon Feb 6 22:33:58 2006
@@ -248,9 +248,7 @@
}
#endif
-#ifdef CONFIG_SVM
start_svm();
-#endif
}
static unsigned int amd_size_cache(struct cpuinfo_x86 * c, unsigned int size)
diff -r f030f4b565a5 -r 707cb68a391f xen/arch/x86/cpu/intel.c
--- a/xen/arch/x86/cpu/intel.c Mon Feb 6 22:25:31 2006
+++ b/xen/arch/x86/cpu/intel.c Mon Feb 6 22:33:58 2006
@@ -187,9 +187,7 @@
if (c->x86 == 6)
set_bit(X86_FEATURE_P3, c->x86_capability);
-#ifdef CONFIG_VMX
start_vmx();
-#endif
}
diff -r f030f4b565a5 -r 707cb68a391f xen/arch/x86/hvm/svm/emulate.c
--- a/xen/arch/x86/hvm/svm/emulate.c Mon Feb 6 22:25:31 2006
+++ b/xen/arch/x86/hvm/svm/emulate.c Mon Feb 6 22:33:58 2006
@@ -26,8 +26,6 @@
#include <asm/hvm/support.h>
#include <asm/hvm/svm/vmcb.h>
#include <asm/hvm/svm/emulate.h>
-
-#ifdef CONFIG_SVM
extern int inst_copy_from_guest(unsigned char *buf, unsigned long guest_eip,
int inst_len);
@@ -504,7 +502,6 @@
"eip = %lx\n", __func__, (unsigned long)vmcb->rip);
return 0;
}
-#endif /* CONFIG_SVM */
/*
* Local variables:
diff -r f030f4b565a5 -r 707cb68a391f xen/arch/x86/hvm/svm/instrlen.c
--- a/xen/arch/x86/hvm/svm/instrlen.c Mon Feb 6 22:25:31 2006
+++ b/xen/arch/x86/hvm/svm/instrlen.c Mon Feb 6 22:33:58 2006
@@ -23,7 +23,6 @@
#define DPRINTF DPRINTK
#include <asm-x86/x86_emulate.h>
-#ifdef CONFIG_SVM
/*
* Opcode effective-address decode tables.
* Note that we only emulate instructions that have at least one memory
@@ -432,4 +431,3 @@
svm_dump_inst(_regs.eip);
return (unsigned long)-1;
}
-#endif /* CONFIG_SVM */
diff -r f030f4b565a5 -r 707cb68a391f xen/arch/x86/hvm/svm/intr.c
--- a/xen/arch/x86/hvm/svm/intr.c Mon Feb 6 22:25:31 2006
+++ b/xen/arch/x86/hvm/svm/intr.c Mon Feb 6 22:33:58 2006
@@ -37,8 +37,6 @@
#include <xen/kernel.h>
#include <public/hvm/ioreq.h>
#include <xen/domain_page.h>
-
-#ifdef CONFIG_SVM
/*
* Most of this code is copied from vmx_io.c and modified
@@ -206,8 +204,6 @@
}
}
-#endif /* CONFIG_SVM */
-
/*
* Local variables:
* mode: C
diff -r f030f4b565a5 -r 707cb68a391f xen/arch/x86/hvm/svm/svm.c
--- a/xen/arch/x86/hvm/svm/svm.c Mon Feb 6 22:25:31 2006
+++ b/xen/arch/x86/hvm/svm/svm.c Mon Feb 6 22:33:58 2006
@@ -49,8 +49,6 @@
#endif
#include <public/sched.h>
#include <public/hvm/ioreq.h>
-
-#ifdef CONFIG_SVM
#define SVM_EXTRA_DEBUG
@@ -2698,7 +2696,6 @@
}
clear_bit(ARCH_SVM_VMCB_ASSIGN_ASID, &v->arch.hvm_svm.flags);
}
-#endif /* CONFIG_SVM */
/*
* Local variables:
diff -r f030f4b565a5 -r 707cb68a391f xen/arch/x86/hvm/svm/vmcb.c
--- a/xen/arch/x86/hvm/svm/vmcb.c Mon Feb 6 22:25:31 2006
+++ b/xen/arch/x86/hvm/svm/vmcb.c Mon Feb 6 22:33:58 2006
@@ -35,8 +35,6 @@
#include <xen/event.h>
#include <xen/kernel.h>
#include <xen/domain_page.h>
-
-#ifdef CONFIG_SVM
extern int svm_dbg_on;
extern int asidpool_assign_next( struct vmcb_struct *vmcb, int retire_current,
@@ -589,7 +587,6 @@
svm_dump_sel("IDTR", &vmcb->idtr);
svm_dump_sel("TR", &vmcb->tr);
}
-#endif /* CONFIG_SVM */
/*
* Local variables:
diff -r f030f4b565a5 -r 707cb68a391f xen/arch/x86/hvm/svm/x86_32/exits.S
--- a/xen/arch/x86/hvm/svm/x86_32/exits.S Mon Feb 6 22:25:31 2006
+++ b/xen/arch/x86/hvm/svm/x86_32/exits.S Mon Feb 6 22:33:58 2006
@@ -79,8 +79,6 @@
popl %ebp; \
popl %eax; \
addl $(NR_SKIPPED_REGS*4), %esp
-
-#ifdef CONFIG_SVM
ALIGN
@@ -216,5 +214,3 @@
sti
call do_softirq
jmp svm_test_all_events
-#endif /* CONFIG_SVM */
-
diff -r f030f4b565a5 -r 707cb68a391f xen/arch/x86/hvm/svm/x86_64/exits.S
--- a/xen/arch/x86/hvm/svm/x86_64/exits.S Mon Feb 6 22:25:31 2006
+++ b/xen/arch/x86/hvm/svm/x86_64/exits.S Mon Feb 6 22:33:58 2006
@@ -92,7 +92,6 @@
popq %rdi; \
addq $(NR_SKIPPED_REGS*8), %rsp; \
-#ifdef CONFIG_SVM
#define VMRUN .byte 0x0F,0x01,0xD8
#define VMLOAD .byte 0x0F,0x01,0xDA
#define VMSAVE .byte 0x0F,0x01,0xDB
@@ -175,5 +174,3 @@
sti
call do_softirq
jmp svm_test_all_events
-#endif /* CONFIG_SVM */
-
diff -r f030f4b565a5 -r 707cb68a391f xen/arch/x86/hvm/vmx/io.c
--- a/xen/arch/x86/hvm/vmx/io.c Mon Feb 6 22:25:31 2006
+++ b/xen/arch/x86/hvm/vmx/io.c Mon Feb 6 22:33:58 2006
@@ -38,8 +38,6 @@
#include <asm/hvm/vlapic.h>
#include <public/hvm/ioreq.h>
-#ifdef CONFIG_VMX
-
#define BSP_CPU(v) (!(v->vcpu_id))
void vmx_set_tsc_shift(struct vcpu *v, struct hvm_virpit *vpit)
@@ -194,7 +192,6 @@
/* We can't resume the guest if we're waiting on I/O */
ASSERT(!test_bit(ARCH_HVM_IO_WAIT, &v->arch.hvm_vcpu.ioflags));
}
-#endif /* CONFIG_VMX */
/*
* Local variables:
diff -r f030f4b565a5 -r 707cb68a391f xen/arch/x86/hvm/vmx/vmcs.c
--- a/xen/arch/x86/hvm/vmx/vmcs.c Mon Feb 6 22:25:31 2006
+++ b/xen/arch/x86/hvm/vmx/vmcs.c Mon Feb 6 22:33:58 2006
@@ -38,8 +38,6 @@
#if CONFIG_PAGING_LEVELS >= 3
#include <asm/shadow_64.h>
#endif
-
-#ifdef CONFIG_VMX
int vmcs_size;
@@ -539,7 +537,6 @@
vmx_do_launch(v);
reset_stack_and_jump(vmx_asm_do_launch);
}
-#endif /* CONFIG_VMX */
/*
* Local variables:
diff -r f030f4b565a5 -r 707cb68a391f xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c Mon Feb 6 22:25:31 2006
+++ b/xen/arch/x86/hvm/vmx/vmx.c Mon Feb 6 22:33:58 2006
@@ -47,9 +47,6 @@
#include <public/hvm/ioreq.h>
#include <asm/hvm/vpic.h>
#include <asm/hvm/vlapic.h>
-
-
-#ifdef CONFIG_VMX
static unsigned long trace_values[NR_CPUS][4];
#define TRACE_VMEXIT(index,value) trace_values[smp_processor_id()][index]=value
@@ -2001,7 +1998,6 @@
TRACE_3D(TRC_VMEXIT,0,0,0);
return;
}
-#endif /* CONFIG_VMX */
/*
* Local variables:
diff -r f030f4b565a5 -r 707cb68a391f xen/arch/x86/hvm/vmx/x86_32/exits.S
--- a/xen/arch/x86/hvm/vmx/x86_32/exits.S Mon Feb 6 22:25:31 2006
+++ b/xen/arch/x86/hvm/vmx/x86_32/exits.S Mon Feb 6 22:33:58 2006
@@ -81,8 +81,6 @@
ALIGN
-#ifdef CONFIG_VMX
-
ENTRY(vmx_asm_vmexit_handler)
/* selectors are restored/saved by VMX */
HVM_SAVE_ALL_NOSEGREGS
@@ -148,5 +146,3 @@
ENTRY(vmx_asm_do_relaunch)
vmx_asm_common 1 1
-
-#endif /* CONFIG_VMX */
diff -r f030f4b565a5 -r 707cb68a391f xen/arch/x86/hvm/vmx/x86_64/exits.S
--- a/xen/arch/x86/hvm/vmx/x86_64/exits.S Mon Feb 6 22:25:31 2006
+++ b/xen/arch/x86/hvm/vmx/x86_64/exits.S Mon Feb 6 22:33:58 2006
@@ -91,7 +91,6 @@
popq %rdi; \
addq $(NR_SKIPPED_REGS*8), %rsp; \
-#ifdef CONFIG_VMX
ENTRY(vmx_asm_vmexit_handler)
/* selectors are restored/saved by VMX */
HVM_SAVE_ALL_NOSEGREGS
@@ -155,6 +154,3 @@
ENTRY(vmx_asm_do_relaunch)
vmx_asm_common 1 1
-
-#endif /* CONFIG_VMX */
-
diff -r f030f4b565a5 -r 707cb68a391f xen/arch/x86/x86_32/asm-offsets.c
--- a/xen/arch/x86/x86_32/asm-offsets.c Mon Feb 6 22:25:31 2006
+++ b/xen/arch/x86/x86_32/asm-offsets.c Mon Feb 6 22:33:58 2006
@@ -72,7 +72,6 @@
DEFINE(_VCPUF_nmi_masked, _VCPUF_nmi_masked);
BLANK();
-#ifdef CONFIG_SVM
OFFSET(VCPU_svm_vmcb_pa, struct vcpu, arch.hvm_svm.vmcb_pa);
OFFSET(VCPU_svm_hsa_pa, struct vcpu, arch.hvm_svm.host_save_pa);
OFFSET(VCPU_svm_vmcb, struct vcpu, arch.hvm_svm.vmcb);
@@ -82,7 +81,6 @@
OFFSET(VMCB_rax, struct vmcb_struct, rax);
OFFSET(VMCB_tsc_offset, struct vmcb_struct, tsc_offset);
BLANK();
-#endif
OFFSET(VCPUINFO_upcall_pending, vcpu_info_t, evtchn_upcall_pending);
OFFSET(VCPUINFO_upcall_mask, vcpu_info_t, evtchn_upcall_mask);
diff -r f030f4b565a5 -r 707cb68a391f xen/arch/x86/x86_64/asm-offsets.c
--- a/xen/arch/x86/x86_64/asm-offsets.c Mon Feb 6 22:25:31 2006
+++ b/xen/arch/x86/x86_64/asm-offsets.c Mon Feb 6 22:33:58 2006
@@ -72,7 +72,6 @@
DEFINE(_VCPUF_nmi_masked, _VCPUF_nmi_masked);
BLANK();
-#ifdef CONFIG_SVM
OFFSET(VCPU_svm_vmcb_pa, struct vcpu, arch.hvm_svm.vmcb_pa);
OFFSET(VCPU_svm_hsa_pa, struct vcpu, arch.hvm_svm.host_save_pa);
OFFSET(VCPU_svm_vmcb, struct vcpu, arch.hvm_svm.vmcb);
@@ -82,7 +81,6 @@
OFFSET(VMCB_rax, struct vmcb_struct, rax);
OFFSET(VMCB_tsc_offset, struct vmcb_struct, tsc_offset);
BLANK();
-#endif
OFFSET(VCPUINFO_upcall_pending, vcpu_info_t, evtchn_upcall_pending);
OFFSET(VCPUINFO_upcall_mask, vcpu_info_t, evtchn_upcall_mask);
diff -r f030f4b565a5 -r 707cb68a391f xen/include/asm-x86/config.h
--- a/xen/include/asm-x86/config.h Mon Feb 6 22:25:31 2006
+++ b/xen/include/asm-x86/config.h Mon Feb 6 22:33:58 2006
@@ -18,8 +18,6 @@
#define CONFIG_X86 1
#define CONFIG_X86_HT 1
#define CONFIG_SHADOW 1
-#define CONFIG_VMX 1
-#define CONFIG_SVM 1
#define CONFIG_SMP 1
#define CONFIG_X86_LOCAL_APIC 1
#define CONFIG_X86_GOOD_APIC 1
diff -r f030f4b565a5 -r 707cb68a391f xen/include/asm-x86/hvm/svm/emulate.h
--- a/xen/include/asm-x86/hvm/svm/emulate.h Mon Feb 6 22:25:31 2006
+++ b/xen/include/asm-x86/hvm/svm/emulate.h Mon Feb 6 22:33:58 2006
@@ -20,8 +20,6 @@
#ifndef __ASM_X86_HVM_SVM_EMULATE_H__
#define __ASM_X86_HVM_SVM_EMULATE_H__
-
-#ifdef CONFIG_SVM
typedef enum OPERATING_MODE_ {
INVALID_OPERATING_MODE = -1,
@@ -146,8 +144,6 @@
vmcb->rip += inst_len;
}
-#endif /* CONFIG_SVM */
-
#endif /* __ASM_X86_HVM_SVM_EMULATE_H__ */
/*
diff -r f030f4b565a5 -r 707cb68a391f xen/include/asm-x86/hvm/svm/intr.h
--- a/xen/include/asm-x86/hvm/svm/intr.h Mon Feb 6 22:25:31 2006
+++ b/xen/include/asm-x86/hvm/svm/intr.h Mon Feb 6 22:33:58 2006
@@ -21,14 +21,10 @@
#ifndef __ASM_X86_HVM_SVM_INTR_H__
#define __ASM_X86_HVM_SVM_INTR_H__
-#ifdef CONFIG_SVM
-
extern void svm_set_tsc_shift(struct vcpu *v, struct hvm_virpit *vpit);
extern void svm_intr_assist(void);
extern void svm_intr_assist_update(struct vcpu *v, int highest_vector);
extern void svm_intr_assist_test_valid(struct vcpu *v,
unsigned long *intr_result);
-#endif /* CONFIG_SVM */
-
#endif /* __ASM_X86_HVM_SVM_INTR_H__ */
diff -r f030f4b565a5 -r 707cb68a391f xen/include/asm-x86/hvm/svm/svm.h
--- a/xen/include/asm-x86/hvm/svm/svm.h Mon Feb 6 22:25:31 2006
+++ b/xen/include/asm-x86/hvm/svm/svm.h Mon Feb 6 22:33:58 2006
@@ -28,7 +28,6 @@
#include <asm/hvm/svm/vmcb.h>
#include <asm/i387.h>
-#ifdef CONFIG_SVM
extern void asidpool_retire( struct vmcb_struct *vmcb, int core );
extern void svm_asm_vmexit_handler(struct cpu_user_regs);
@@ -86,6 +85,4 @@
#define SVM_REG_R14 (14)
#define SVM_REG_R15 (15)
-#endif /* CONFIG_SVM */
-
#endif /* __ASM_X86_HVM_SVM_H__ */
diff -r f030f4b565a5 -r 707cb68a391f xen/include/asm-x86/hvm/svm/vmcb.h
--- a/xen/include/asm-x86/hvm/svm/vmcb.h Mon Feb 6 22:25:31 2006
+++ b/xen/include/asm-x86/hvm/svm/vmcb.h Mon Feb 6 22:33:58 2006
@@ -22,8 +22,6 @@
#include <asm/config.h>
#include <asm/hvm/hvm.h>
-
-#ifdef CONFIG_SVM
extern int start_svm(void);
@@ -488,8 +486,6 @@
#define VMCB_EFLAGS_RESERVED_0 0xffc08028 /* bitmap for 0 */
#define VMCB_EFLAGS_RESERVED_1 0x00000002 /* bitmap for 1 */
-#endif /* CONFIG_SVM */
-
#endif /* ASM_X86_HVM_SVM_VMCS_H__ */
/*
diff -r f030f4b565a5 -r 707cb68a391f xen/include/asm-x86/hvm/svm/vmmcall.h
--- a/xen/include/asm-x86/hvm/svm/vmmcall.h Mon Feb 6 22:25:31 2006
+++ b/xen/include/asm-x86/hvm/svm/vmmcall.h Mon Feb 6 22:33:58 2006
@@ -22,8 +22,6 @@
#ifndef __ASM_X86_HVM_SVM_VMMCALL_H__
#define __ASM_X86_HVM_SVM_VMMCALL_H__
-#ifdef CONFIG_SVM
-
/* VMMCALL command fields */
#define VMMCALL_CODE_CPL_MASK 0xC0000000
#define VMMCALL_CODE_MBZ_MASK 0x3FFF0000
@@ -43,6 +41,4 @@
return (cmd & VMMCALL_CODE_CPL_MASK) >> 30;
}
-#endif /* CONFIG_SVM */
-
#endif /* __ASM_X86_HVM_SVM_VMMCALL_H__ */
diff -r f030f4b565a5 -r 707cb68a391f xen/include/asm-x86/hvm/vcpu.h
--- a/xen/include/asm-x86/hvm/vcpu.h Mon Feb 6 22:25:31 2006
+++ b/xen/include/asm-x86/hvm/vcpu.h Mon Feb 6 22:33:58 2006
@@ -22,13 +22,8 @@
#include <asm/hvm/io.h>
#include <asm/hvm/vlapic.h>
-
-#ifdef CONFIG_VMX
#include <asm/hvm/vmx/vmcs.h>
-#endif
-#ifdef CONFIG_SVM
#include <asm/hvm/svm/vmcb.h>
-#endif
struct hvm_vcpu {
unsigned long ioflags;
@@ -36,12 +31,8 @@
struct vlapic *vlapic;
union {
-#ifdef CONFIG_VMX
struct arch_vmx_struct vmx;
-#endif
-#ifdef CONFIG_SVM
struct arch_svm_struct svm;
-#endif
} u;
};
diff -r f030f4b565a5 -r 707cb68a391f xen/include/asm-x86/hvm/vmx/cpu.h
--- a/xen/include/asm-x86/hvm/vmx/cpu.h Mon Feb 6 22:25:31 2006
+++ b/xen/include/asm-x86/hvm/vmx/cpu.h Mon Feb 6 22:33:58 2006
@@ -19,8 +19,6 @@
#ifndef __ASM_X86_HVM_VMX_CPU_H__
#define __ASM_X86_HVM_VMX_CPU_H__
-#ifdef CONFIG_VMX
-
/*
* Virtual CPU
*/
@@ -34,6 +32,4 @@
#define VMX_MF_32 1
#define VMX_MF_64 2
-#endif /* CONFIG_VMX */
-
#endif /* __ASM_X86_HVM_VMX_CPU_H__ */
diff -r f030f4b565a5 -r 707cb68a391f xen/include/asm-x86/hvm/vmx/vmcs.h
--- a/xen/include/asm-x86/hvm/vmx/vmcs.h Mon Feb 6 22:25:31 2006
+++ b/xen/include/asm-x86/hvm/vmx/vmcs.h Mon Feb 6 22:33:58 2006
@@ -23,8 +23,6 @@
#include <asm/hvm/io.h>
#include <asm/hvm/vmx/cpu.h>
#include <public/hvm/vmx_assist.h>
-
-#ifdef CONFIG_VMX
extern int start_vmx(void);
extern void stop_vmx(void);
@@ -248,8 +246,6 @@
HOST_RIP = 0x00006c16,
};
-#endif /* CONFIG_VMX */
-
#endif /* ASM_X86_HVM_VMX_VMCS_H__ */
/*
diff -r f030f4b565a5 -r 707cb68a391f xen/include/asm-x86/hvm/vmx/vmx.h
--- a/xen/include/asm-x86/hvm/vmx/vmx.h Mon Feb 6 22:25:31 2006
+++ b/xen/include/asm-x86/hvm/vmx/vmx.h Mon Feb 6 22:33:58 2006
@@ -25,8 +25,6 @@
#include <asm/processor.h>
#include <asm/hvm/vmx/vmcs.h>
#include <asm/i387.h>
-
-#ifdef CONFIG_VMX
extern void vmx_asm_vmexit_handler(struct cpu_user_regs);
extern void vmx_asm_do_resume(void);
@@ -458,6 +456,4 @@
return 0;
}
-#endif /* CONFIG_VMX */
-
#endif /* __ASM_X86_HVM_VMX_VMX_H__ */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |