summaryrefslogtreecommitdiff
path: root/i386/xen
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2013-01-28 01:51:23 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2013-01-28 02:36:24 +0100
commit28d83087776ebdad43a11fa3e687859462de4542 (patch)
treee86cecc7ac4dfd13c4eb1500078abe8283fbe7f7 /i386/xen
parent338d9ca7981f25099d99d280b0dd3af590d65763 (diff)
Add initial code for disabling PV descriptors
* xen/configfrag.ac (--disable-pv-descriptors): Add option * i386/xen/xen_boothdr.S (XEN_ELFNOTE_FEATURES) [!MACH_PV_DESCRIPTORS]: Add writable_descriptor_tables. * i386/i386/gdt.c: Turn appropriate MACH_XEN/MACH_HYP tests into MACH_PV_DESCRIPTORS tests. * i386/i386/gdt.h: Likewise. * i386/i386/i386asm.sym: Likewise. * i386/i386/idt.c: Likewise. * i386/i386/idt_inittab.S: Likewise. * i386/i386/ldt.c: Likewise. * i386/i386/pcb.c: Likewise. * i386/i386/seg.h: Likewise. * i386/i386/user_ldt.c: Likewise. * i386/i386/user_ldt.h: Likewise.
Diffstat (limited to 'i386/xen')
-rw-r--r--i386/xen/xen_boothdr.S8
1 files changed, 7 insertions, 1 deletions
diff --git a/i386/xen/xen_boothdr.S b/i386/xen/xen_boothdr.S
index eacf0d8..4e2fb51 100644
--- a/i386/xen/xen_boothdr.S
+++ b/i386/xen/xen_boothdr.S
@@ -36,6 +36,9 @@
#else /* MACH_PSEUDO_PHYS */
.ascii ",FEATURES=!auto_translated_physmap"
#endif
+#ifndef MACH_PV_DESCRIPTORS
+ .ascii "|writable_descriptor_tables"
+#endif /* MACH_PV_DESCRIPTORS */
.byte 0
/* Macro taken from linux/include/linux/elfnote.h */
@@ -68,8 +71,11 @@
#ifdef MACH_PSEUDO_PHYS
"pae_pgdir_above_4gb"
#else /* MACH_PSEUDO_PHYS */
- "!auto_translated_physmap|"
+ "!auto_translated_physmap"
#endif
+#ifndef MACH_PV_DESCRIPTORS
+ "|writable_descriptor_tables"
+#endif /* MACH_PV_DESCRIPTORS */
)
#include <mach/machine/asm.h>