# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1310127609 -3600
# Node ID 6ba6b11c48e1bcba0e4ae15b1c4ed0906917548f
# Parent d80088d2c12f484f2f349a1c4d6e34ecfddf25e9
Revert 23664:3e3c0a8be9f9
---
diff -r d80088d2c12f -r 6ba6b11c48e1 tools/libxc/xc_dom_elfloader.c
--- a/tools/libxc/xc_dom_elfloader.c Fri Jul 08 11:44:23 2011 +0100
+++ b/tools/libxc/xc_dom_elfloader.c Fri Jul 08 13:20:09 2011 +0100
@@ -286,15 +286,6 @@
if ( (rc = elf_xen_parse(elf, &dom->parms)) != 0 )
return rc;
- if ( elf_xen_feature_get(XENFEAT_privileged, dom->parms.f_required) ||
- (elf_xen_feature_get(XENFEAT_privileged, dom->parms.f_supported) &&
- !elf_xen_feature_get(XENFEAT_unprivileged, dom->parms.f_supported)) )
- {
- xc_dom_panic(dom->xch, XC_INVALID_KERNEL, "%s: Kernel does not"
- " support unprivileged (DomU) operation", __FUNCTION__);
- return -EINVAL;
- }
-
/* find kernel segment */
dom->kernel_seg.vstart = dom->parms.virt_kstart;
dom->kernel_seg.vend = dom->parms.virt_kend;
diff -r d80088d2c12f -r 6ba6b11c48e1 xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c Fri Jul 08 11:44:23 2011 +0100
+++ b/xen/arch/ia64/xen/domain.c Fri Jul 08 13:20:09 2011 +0100
@@ -2164,14 +2164,6 @@
return -1;
}
- if (test_bit(XENFEAT_unprivileged, parms.f_required) ||
- (test_bit(XENFEAT_unprivileged, parms.f_supported) &&
- !test_bit(XENFEAT_privileged, parms.f_supported)))
- {
- printk("Kernel does not support Dom0 operation\n");
- return -1;
- }
-
p_start = parms.virt_base;
pkern_start = parms.virt_kstart;
pkern_end = parms.virt_kend;
diff -r d80088d2c12f -r 6ba6b11c48e1 xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c Fri Jul 08 11:44:23 2011 +0100
+++ b/xen/arch/x86/domain_build.c Fri Jul 08 13:20:09 2011 +0100
@@ -415,14 +415,6 @@
return -EINVAL;
}
- if ( test_bit(XENFEAT_unprivileged, parms.f_required) ||
- (test_bit(XENFEAT_unprivileged, parms.f_supported) &&
- !test_bit(XENFEAT_privileged, parms.f_supported)) )
- {
- printk("Kernel does not support Dom0 operation\n");
- return -EINVAL;
- }
-
#if defined(__x86_64__)
if ( compat32 )
{
diff -r d80088d2c12f -r 6ba6b11c48e1 xen/common/kernel.c
--- a/xen/common/kernel.c Fri Jul 08 11:44:23 2011 +0100
+++ b/xen/common/kernel.c Fri Jul 08 13:20:09 2011 +0100
@@ -278,8 +278,7 @@
switch ( fi.submap_idx )
{
case 0:
- fi.submap = 1U << (IS_PRIV(current->domain) ?
- XENFEAT_privileged : XENFEAT_unprivileged);
+ fi.submap = 0;
if ( VM_ASSIST(d, VMASST_TYPE_pae_extended_cr3) )
fi.submap |= (1U << XENFEAT_pae_pgdir_above_4gb);
if ( paging_mode_translate(current->domain) )
diff -r d80088d2c12f -r 6ba6b11c48e1 xen/common/libelf/libelf-dominfo.c
--- a/xen/common/libelf/libelf-dominfo.c Fri Jul 08 11:44:23 2011 +0100
+++ b/xen/common/libelf/libelf-dominfo.c Fri Jul 08 13:20:09 2011 +0100
@@ -26,9 +26,7 @@
[XENFEAT_writable_descriptor_tables] = "writable_descriptor_tables",
[XENFEAT_auto_translated_physmap] = "auto_translated_physmap",
[XENFEAT_supervisor_mode_kernel] = "supervisor_mode_kernel",
- [XENFEAT_pae_pgdir_above_4gb] = "pae_pgdir_above_4gb",
- [XENFEAT_privileged] = "privileged",
- [XENFEAT_unprivileged] = "unprivileged"
+ [XENFEAT_pae_pgdir_above_4gb] = "pae_pgdir_above_4gb"
};
static const int elf_xen_features =
sizeof(elf_xen_feature_names) / sizeof(elf_xen_feature_names[0]);
diff -r d80088d2c12f -r 6ba6b11c48e1 xen/include/public/features.h
--- a/xen/include/public/features.h Fri Jul 08 11:44:23 2011 +0100
+++ b/xen/include/public/features.h Fri Jul 08 13:20:09 2011 +0100
@@ -75,13 +75,7 @@
#define XENFEAT_hvm_safe_pvclock 9
/* x86: pirq can be used by HVM guests */
-#define XENFEAT_hvm_pirqs 10
-
-/* privileged operation is supported */
-#define XENFEAT_privileged 11
-
-/* un-privileged operation is supported */
-#define XENFEAT_unprivileged 12
+#define XENFEAT_hvm_pirqs 10
#define XENFEAT_NR_SUBMAPS 1
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home