From: Roger Pau Monne <[email protected]>
Signed-off-by: Roger Pau Monné <[email protected]>
---
xen/arch/x86/pv/dom0_build.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c
index 23d5993b7e..95347c6fd2 100644
--- a/xen/arch/x86/pv/dom0_build.c
+++ b/xen/arch/x86/pv/dom0_build.c
@@ -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;
--
2.11.0
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
