From: "Daniel P. Smith" <dpsm...@apertussolutions.com>
Enable selecting the mode in which the domain will be built and ran. This
includes:
- whether it will be either a 32/64 bit domain
- if it will be run as a PV or HVM domain
- and if it will require a device model (not applicable for dom0)
In the device tree, this will be represented as a bit map that will be carried
through into struct boot_domain.
Signed-off-by: Daniel P. Smith <dpsm...@apertussolutions.com>
Reviewed-by: Jason Andryuk <jason.andr...@amd.com>
Signed-off-by: Alejandro Vallejo <agarc...@amd.com>
Reviewed-by: Denis Mukhin <dmuk...@ford.com>
---
xen/arch/x86/include/asm/boot-domain.h | 5 +++++
xen/arch/x86/setup.c | 3 ++-
xen/common/domain-builder/fdt.c | 21 +++++++++++++++++++++
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/xen/arch/x86/include/asm/boot-domain.h
b/xen/arch/x86/include/asm/boot-domain.h
index d7c6042e25..e316d4bcde 100644
--- a/xen/arch/x86/include/asm/boot-domain.h
+++ b/xen/arch/x86/include/asm/boot-domain.h
@@ -13,6 +13,11 @@
struct boot_domain {
domid_t domid;
+ /* On | Off */
+#define BUILD_MODE_PARAVIRT (1 << 0) /* PV | PVH/HVM */
+#define BUILD_MODE_ENABLE_DM (1 << 1) /* HVM | PVH */
+ uint32_t mode;
+
struct boot_module *kernel;
struct boot_module *module;
const char *cmdline;
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 10ff67ac37..343f87ee9d 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1030,7 +1030,8 @@ static struct domain *__init create_dom0(struct boot_info
*bi)
struct boot_domain *bd = &bi->domains[0];
struct domain *d;
- if ( opt_dom0_pvh )
+ if ( opt_dom0_pvh ||
+ (bi->hyperlaunch_enabled && !(bd->mode & BUILD_MODE_PARAVIRT)) )
{
dom0_cfg.flags |= (XEN_DOMCTL_CDF_hvm |
((hvm_hap_supported() && !opt_dom0_shadow) ?
diff --git a/xen/common/domain-builder/fdt.c b/xen/common/domain-builder/fdt.c
index 2c05b0a22d..aadca11dfa 100644
--- a/xen/common/domain-builder/fdt.c
+++ b/xen/common/domain-builder/fdt.c
@@ -235,6 +235,27 @@ static int __init fdt_process_domain_node(
bd->domid = val;
printk(XENLOG_INFO " domid: %d\n", bd->domid);
}
+ else if ( !strncmp(prop_name, "mode", name_len) )
+ {
+ if ( (rc = fdt_prop_as_u32(prop, &bd->mode)) )
+ {
+ printk(XENLOG_ERR
+ " failed processing mode for domain %s\n", name);
+ return rc;
+ }
+
+ if ( (bd->mode & BUILD_MODE_PARAVIRT) &&
+ (bd->mode & BUILD_MODE_ENABLE_DM) )
+ {
+ printk(XENLOG_ERR " mode: invalid (pv+hvm)\n");
+ return -EINVAL;
+ }
+
+ printk(XENLOG_INFO " mode: %s\n",
+ (bd->mode & BUILD_MODE_PARAVIRT) ? "pv" :
+ (bd->mode & BUILD_MODE_ENABLE_DM) ? "hvm" :
+ "pvh");
+ }
}
fdt_for_each_subnode(node, fdt, dom_node)
--
2.43.0
