[Xen-changelog] [xen master] x86: make construct_dom0 build with !CONFIG_PV

[p***@xen.org]

commit 29b0678b3cbc03c2acc738d503988eb523201317
Author: Wei Liu <***@citrix.com>
AuthorDate: Fri Oct 19 15:28:30 2018 +0100
Commit: Wei Liu <***@citrix.com>
CommitDate: Sat Oct 20 12:31:41 2018 +0100

x86: make construct_dom0 build with !CONFIG_PV

Signed-off-by: Wei Liu <***@citrix.com>
Reviewed-by: Andrew Cooper <***@citrix.com>
---
xen/arch/x86/dom0_build.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

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;

--
generated by git-patchbot for /home/xen/git/xen.git#master