repository: /home/avi/kvm
branch: master
commit a57b838b49bc4e4e7439b18d0323385d53e41c7f
Author: Avi Kivity <[EMAIL PROTECTED]>
Date: Fri Nov 23 09:33:26 2007 +0200
kvm: external module: revert desc_struct compatibility
This reverts commits
6b5b8aa4fa27bd4ba05476b8b98c8b2dff95a681,
6a385c9539f9746d7ff51ef34c064c3eba86448b,
fb81ce99e4eabe3dbb6fd30592425aa5f52a7f19, and
d625c64ea1be2e8bd8b33f92e3c29e794f653676.
Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
diff --git a/kernel/Makefile b/kernel/Makefile
index 3de4bf5..0c8f34f 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -34,7 +34,6 @@ sync:
$(call hack, vmx.c)
$(call hack, svm.c)
$(call hack, x86.c)
- $(call hack, x86.h)
install:
mkdir -p $(DESTDIR)/$(INSTALLDIR)
diff --git a/kernel/external-module-compat.h b/kernel/external-module-compat.h
index 668312a..852416e 100644
--- a/kernel/external-module-compat.h
+++ b/kernel/external-module-compat.h
@@ -3,16 +3,6 @@
* Compatibility header for building as an external module.
*/
-/* use own set of desc_struct, desc_ptr */
-
-#include <asm/desc.h>
-
-#define desc_struct kvm_desc_struct
-#define desc_ptr kvm_desc_ptr
-#define ldttss_desc kvm_ldttss_struct
-
-#include <asm/kvm_desc_defs.h>
-
/*
* Avoid picking up the kernel's kvm.h in case we have a newer one.
*/
@@ -569,9 +559,6 @@ static inline void blahblah(void)
#define X86_FEATURE_NX (1*32+20)
#endif
-#define desc_struct kvm_desc_struct
-#define desc_ptr kvm_desc_ptr
-
#undef true
#define true 1
#undef false
diff --git a/kernel/hack-module.awk b/kernel/hack-module.awk
index ba25794..bac93e1 100644
--- a/kernel/hack-module.awk
+++ b/kernel/hack-module.awk
@@ -61,8 +61,6 @@
/atomic_inc\(&kvm->mm->mm_count\);/ { $0 = "//" $0 }
-/asm\/desc_defs.h/ { $0 = "#include <asm/kvm_desc_defs.h>" }
-
{ print }
/kvm_x86_ops->run/ {
diff --git a/kernel/include/asm/kvm_desc_defs.h
b/kernel/include/asm/kvm_desc_defs.h
deleted file mode 100644
index d847f47..0000000
--- a/kernel/include/asm/kvm_desc_defs.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Written 2000 by Andi Kleen */
-#ifndef __KVM_ARCH_DESC_DEFS_H
-#define __KVM_ARCH_DESC_DEFS_H
-
-/*
- * Segment descriptor structure definitions, usable from both x86_64 and i386
- * archs.
- */
-
-#ifndef __ASSEMBLY__
-
-#include <linux/types.h>
-
-// 8 byte segment descriptor
-struct desc_struct {
- u16 limit0;
- u16 base0;
- unsigned base1 : 8, type : 4, s : 1, dpl : 2, p : 1;
- unsigned limit : 4, avl : 1, l : 1, d : 1, g : 1, base2 : 8;
-} __attribute__((packed));
-
-// LDT or TSS descriptor in the GDT. 16 bytes.
-struct ldttss_desc {
- u16 limit0;
- u16 base0;
- unsigned base1 : 8, type : 5, dpl : 2, p : 1;
- unsigned limit1 : 4, zero0 : 3, g : 1, base2 : 8;
- u32 base3;
- u32 zero1;
-} __attribute__((packed));
-
-struct desc_ptr {
- unsigned short size;
- unsigned long address;
-} __attribute__((packed)) ;
-
-
-#endif /* !__ASSEMBLY__ */
-
-#endif
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits
