From: Wei Liu <wei.liu2@citrix.com>
Date: Fri, 19 Oct 2018 14:28:30 +0000 (+0100)
Subject: x86: make construct_dom0 build with !CONFIG_PV
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~3121
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=29b0678b3cbc03c2acc738d503988eb523201317;p=xen.git

x86: make construct_dom0 build with !CONFIG_PV

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c
index dcd7afb058..fe73cef899 100644
--- a/xen/arch/x86/dom0_build.c
+++ b/xen/arch/x86/dom0_build.c
@@ -510,8 +510,13 @@ int __init construct_dom0(struct domain *d, const module_t *image,
     }
 #endif
 
-    rc = (is_hvm_domain(d) ? dom0_construct_pvh : dom0_construct_pv)
-         (d, image, image_headroom, initrd, cmdline);
+    if ( is_hvm_domain(d) )
+        rc = dom0_construct_pvh(d, image, image_headroom, initrd, cmdline);
+    else if ( is_pv_domain(d) )
+        rc = dom0_construct_pv(d, image, image_headroom, initrd, cmdline);
+    else
+        panic("Cannot construct Dom0. No guest interface available\n");
+
     if ( rc )
         return rc;