]> xenbits.xensource.com Git - people/iwj/xen.git/commitdiff
xen/pvshim: remove Dom0 kernel support check
authorRoger Pau Monne <roger.pau@citrix.com>
Tue, 5 Dec 2017 16:21:57 +0000 (16:21 +0000)
committerRoger Pau Monne <roger.pau@citrix.com>
Tue, 12 Dec 2017 10:50:05 +0000 (10:50 +0000)
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
xen/arch/x86/pv/dom0_build.c

index 23d5993b7e8acb6bf24b40feaea690eb64e925e3..95347c6fd28c5e6d9cfa9cf676394b8198583521 100644 (file)
@@ -19,6 +19,7 @@
 #include <asm/dom0_build.h>
 #include <asm/page.h>
 #include <asm/pv/mm.h>
+#include <asm/pv/shim.h>
 #include <asm/setup.h>
 
 /* Allow ring-3 access in long mode as guest cannot use ring 1 ... */
@@ -373,7 +374,7 @@ int __init dom0_construct_pv(struct domain *d,
 
     if ( parms.elf_notes[XEN_ELFNOTE_SUPPORTED_FEATURES].type != XEN_ENT_NONE )
     {
-        if ( !test_bit(XENFEAT_dom0, parms.f_supported) )
+        if ( !pv_shim && !test_bit(XENFEAT_dom0, parms.f_supported) )
         {
             printk("Kernel does not support Dom0 operation\n");
             rc = -EINVAL;