[Xen-changelog] [xen-unstable] arm: Implement arch_get_xen_caps

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1329308659 0
# Node ID 6ed7fdb587afd1fd6f724032cf7040041369f819
# Parent  23c06434d094800346bfb6c10741a99c5daf4638
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 <ian.campbell@xxxxxxxxxx>
Acked-by: Stefano Stabellini <Stefano.Stabellini@xxxxxxxxxxxxx>
Acked-by: Tim Deegan <tim@xxxxxxx>
Committed-by: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
---


diff -r 23c06434d094 -r 6ed7fdb587af xen/arch/arm/dummy.S
--- a/xen/arch/arm/dummy.S      Wed Feb 15 12:24:18 2012 +0000
+++ b/xen/arch/arm/dummy.S      Wed Feb 15 12:24:19 2012 +0000
@@ -9,7 +9,6 @@
 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 -r 23c06434d094 -r 6ed7fdb587af xen/arch/arm/mm.c
--- a/xen/arch/arm/mm.c Wed Feb 15 12:24:18 2012 +0000
+++ b/xen/arch/arm/mm.c Wed Feb 15 12:24:19 2012 +0000
@@ -24,6 +24,7 @@
 #include <xen/init.h>
 #include <xen/mm.h>
 #include <xen/preempt.h>
+#include <xen/errno.h>
 #include <asm/page.h>
 #include <asm/current.h>
 
diff -r 23c06434d094 -r 6ed7fdb587af xen/arch/arm/setup.c
--- a/xen/arch/arm/setup.c      Wed Feb 15 12:24:18 2012 +0000
+++ b/xen/arch/arm/setup.c      Wed Feb 15 12:24:19 2012 +0000
@@ -271,6 +271,18 @@
     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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog