From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xensource.com
Cc: Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH 08/12] arm: Implement arch_get_xen_caps
Date: Fri, 20 Jan 2012 12:06:34 +0000 [thread overview]
Message-ID: <1327061198-29854-8-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1327061025.30054.21.camel@zakaz.uk.xensource.com>
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@citrix.com>
---
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 <xen/init.h>
#include <xen/mm.h>
#include <xen/preempt.h>
+#include <xen/errno.h>
#include <asm/page.h>
#include <asm/current.h>
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
next prev parent reply other threads:[~2012-01-20 12:06 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-20 12:03 [PATCH 00/12] ARM: Slim down dummy.S Ian Campbell
2012-01-20 12:06 ` [PATCH 01/12] arm: add a missing local-vars comment Ian Campbell
2012-01-20 12:06 ` [PATCH 02/12] arm: define some more cp15 registers Ian Campbell
2012-01-20 12:06 ` [PATCH 03/12] arm: align some register bit definitions Ian Campbell
2012-01-20 12:06 ` [PATCH 04/12] arm: remove some unnecessary symbols from dummy.S Ian Campbell
2012-01-20 12:06 ` [PATCH 05/12] arm: Add stub functions instead of using DUMMY Ian Campbell
2012-01-20 12:06 ` [PATCH 06/12] PM: only include XEN_SYSCTL_{get_pmstat, pm_op} if HAVE_ACPI Ian Campbell
2012-01-20 12:06 ` [PATCH 07/12] xen: allow tmem to be disabled on platforms which do not support it (ARM) Ian Campbell
2012-01-20 12:19 ` Stefano Stabellini
2012-01-20 12:25 ` Tim Deegan
2012-01-20 12:34 ` Jan Beulich
2012-01-20 22:24 ` Dan M @ Oracle
2012-01-20 12:28 ` Ian Campbell
2012-01-20 12:36 ` Jan Beulich
2012-01-20 12:39 ` Ian Campbell
2012-01-20 12:51 ` Jan Beulich
2012-01-20 12:06 ` Ian Campbell [this message]
2012-01-20 12:06 ` [PATCH 09/12] xen: only map PV guest grants via iommu if HAS_PASSTHROUGH Ian Campbell
2012-01-20 12:38 ` Jan Beulich
2012-01-20 12:40 ` Ian Campbell
2012-01-20 12:52 ` Jan Beulich
2012-01-20 12:06 ` [PATCH 10/12] arm: stub out PoD Ian Campbell
2012-01-20 12:20 ` Stefano Stabellini
2012-01-20 12:29 ` Ian Campbell
2012-01-20 12:35 ` Tim Deegan
2012-01-20 12:40 ` Ian Campbell
2012-01-20 12:06 ` [PATCH 11/12] arm: define max_page Ian Campbell
2012-01-20 12:06 ` [PATCH 12/12] arm: Group remaining dummy symbols somewhat according to functionality Ian Campbell
2012-01-20 12:20 ` [PATCH 00/12] ARM: Slim down dummy.S Stefano Stabellini
-- strict thread matches above, loose matches on Subject: below --
2012-02-14 14:43 [PATCH 00/12 v2] " Ian Campbell
2012-02-14 14:43 ` [PATCH 08/12] arm: Implement arch_get_xen_caps Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1327061198-29854-8-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).