From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 08/12] arm: Implement arch_get_xen_caps Date: Fri, 20 Jan 2012 12:06:34 +0000 Message-ID: <1327061198-29854-8-git-send-email-ian.campbell@citrix.com> References: <1327061025.30054.21.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1327061025.30054.21.camel@zakaz.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: Ian Campbell List-Id: xen-devel@lists.xenproject.org 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 --- xen/arch/arm/dummy.S | 1 - xen/arch/arm/mm.c | 1 + xen/arch/arm/setup.c | 12 ++++++++++++ 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/dummy.S b/xen/arch/arm/dummy.S index da0b906..5010619 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 45971cb..50c3634 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 2433723..2fcde24 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -213,6 +213,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 -- 1.7.2.5