]> xenbits.xensource.com Git - people/dariof/xen.git/commitdiff
x86: make construct_dom0 build with !CONFIG_PV
authorWei Liu <wei.liu2@citrix.com>
Fri, 19 Oct 2018 14:28:30 +0000 (15:28 +0100)
committerWei Liu <wei.liu2@citrix.com>
Sat, 20 Oct 2018 11:31:41 +0000 (12:31 +0100)
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
xen/arch/x86/dom0_build.c

index dcd7afb05860e21be9b5de8d5e8c199eacef834e..fe73cef899e4588838222dea88f11c45938ebe80 100644 (file)
@@ -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;