From 7cfc339cbc2f36b603c32478a769456f3660e061 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 15 Feb 2012 12:24:19 +0000 Subject: arm: Implement arch_get_xen_caps TBD: correct arch name for this string. Should be "xen-" / "hvm-" or something else given the hybrid model we are using on ARM? Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Tim Deegan Committed-by: Ian Campbell --- xen/arch/arm/dummy.S | 1 - xen/arch/arm/mm.c | 1 + xen/arch/arm/setup.c | 12 ++++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/dummy.S b/xen/arch/arm/dummy.S index da0b906a60..5010619938 100644 --- a/xen/arch/arm/dummy.S +++ b/xen/arch/arm/dummy.S @@ -9,7 +9,6 @@ x: mov pc, lr DUMMY(alloc_pirq_struct); DUMMY(alloc_vcpu_guest_context); DUMMY(arch_get_info_guest); -DUMMY(arch_get_xen_caps); DUMMY(arch_set_info_guest); DUMMY(arch_vcpu_reset); DUMMY(create_grant_host_mapping); diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 2c905eda1d..0cff7262db 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index ddc2392a4a..7762166b55 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -271,6 +271,18 @@ void __init start_xen(unsigned long boot_phys_offset, reset_stack_and_jump(init_done); } +void arch_get_xen_caps(xen_capabilities_info_t *info) +{ + /* Interface name is always xen-3.0-* for Xen-3.x. */ + int major = 3, minor = 0; + char s[32]; + + (*info)[0] = '\0'; + + snprintf(s, sizeof(s), "xen-%d.%d-armv7l ", major, minor); + safe_strcat(*info, s); +} + /* * Local variables: * mode: C -- cgit v1.2.3