Add the ability to designate a domain as the Xenstore domain via the
hyperlaunch configuration.
Signed-off-by: Daniel P. Smith <dpsm...@apertussolutions.com>
---
xen/arch/x86/domain-builder/core.c | 2 +-
xen/arch/x86/domain-builder/domain.c | 2 ++
xen/arch/x86/domain-builder/fdt.c | 2 ++
xen/arch/x86/include/asm/boot-domain.h | 1 +
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/xen/arch/x86/domain-builder/core.c
b/xen/arch/x86/domain-builder/core.c
index 2f0b8bd82c3a..e21f5efbfe62 100644
--- a/xen/arch/x86/domain-builder/core.c
+++ b/xen/arch/x86/domain-builder/core.c
@@ -98,7 +98,7 @@ void __init builder_init(struct boot_info *bi)
bi->mods[i].type = BOOTMOD_KERNEL;
bi->domains[0].kernel = &bi->mods[i];
bi->domains[0].capabilities |=
- (BUILD_CAPS_CONTROL | BUILD_CAPS_HARDWARE);
+ (BUILD_CAPS_CONTROL | BUILD_CAPS_HARDWARE | BUILD_CAPS_XENSTORE);
bi->nr_domains = 1;
}
}
diff --git a/xen/arch/x86/domain-builder/domain.c
b/xen/arch/x86/domain-builder/domain.c
index 13f99111a3a9..c1b2e011aaa0 100644
--- a/xen/arch/x86/domain-builder/domain.c
+++ b/xen/arch/x86/domain-builder/domain.c
@@ -250,6 +250,8 @@ struct domain *__init arch_create_dom(
if ( bd->domid == DOMID_INVALID )
/* Create initial domain. Not d0 for pvshim. */
bd->domid = get_initial_domain_id();
+ if ( bd->capabilities & BUILD_CAPS_XENSTORE )
+ dom_cfg.flags |= XEN_DOMCTL_CDF_xs_domain;
if ( bd->capabilities & BUILD_CAPS_CONTROL )
create_flags |= CDF_privileged | CDF_hardware;
d = domain_create(bd->domid, &dom_cfg,
diff --git a/xen/arch/x86/domain-builder/fdt.c
b/xen/arch/x86/domain-builder/fdt.c
index 1af58ed4eb86..9c6c0ae09a24 100644
--- a/xen/arch/x86/domain-builder/fdt.c
+++ b/xen/arch/x86/domain-builder/fdt.c
@@ -269,6 +269,8 @@ static int __init process_domain_node(
printk("c");
if ( bd->capabilities & BUILD_CAPS_HARDWARE )
printk(" h");
+ if ( bd->capabilities & BUILD_CAPS_XENSTORE )
+ printk(" x");
printk("\n");
}
}
diff --git a/xen/arch/x86/include/asm/boot-domain.h
b/xen/arch/x86/include/asm/boot-domain.h
index 18d144de2fea..32f1f8fbc4e8 100644
--- a/xen/arch/x86/include/asm/boot-domain.h
+++ b/xen/arch/x86/include/asm/boot-domain.h
@@ -16,6 +16,7 @@ struct boot_domain {
#define BUILD_CAPS_NONE (0)
#define BUILD_CAPS_CONTROL (1 << 0)
#define BUILD_CAPS_HARDWARE (1 << 1)
+#define BUILD_CAPS_XENSTORE (1 << 2)
uint32_t capabilities;
/* On | Off */
--
2.30.2
