From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xensource.com, xen-arm@lists.xensource.com
Cc: stefano.stabellini@citrix.com, Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH 3/5] libxl: do not allocate e820 for non x86 guests.
Date: Mon, 16 Jan 2012 12:16:08 +0000 [thread overview]
Message-ID: <1326716171-4298-3-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1326716171-4298-1-git-send-email-ian.campbell@citrix.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
tools/libxl/libxl_create.c | 3 ++-
tools/libxl/libxl_pci.c | 2 ++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index ebf2ed7..1c04e22 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -640,7 +640,7 @@ static int do_domain_create(libxl__gc *gc, libxl_domain_config *d_config,
goto error_out;
}
}
-
+#if defined(__i386__) || defined(__x86_64__)
if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV &&
d_config->b_info.u.pv.e820_host) {
int rc;
@@ -650,6 +650,7 @@ static int do_domain_create(libxl__gc *gc, libxl_domain_config *d_config,
"Failed while collecting E820 with: %d (errno:%d)\n",
rc, errno);
}
+#endif
if ( cb && (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM ||
(d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV &&
d_config->b_info.u.pv.bootloader ))) {
diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c
index 8b2a1c5..cae4fe6 100644
--- a/tools/libxl/libxl_pci.c
+++ b/tools/libxl/libxl_pci.c
@@ -1163,6 +1163,7 @@ int libxl__device_pci_destroy_all(libxl__gc *gc, uint32_t domid)
return 0;
}
+#if defined(__i386__) || defined(__x86_64__)
static const char *e820_names(int type)
{
switch (type) {
@@ -1404,6 +1405,7 @@ int libxl__e820_alloc(libxl__gc *gc, uint32_t domid, libxl_domain_config *d_conf
}
return 0;
}
+#endif
/*
* Local variables:
--
1.7.8.3
next prev parent reply other threads:[~2012-01-16 12:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-16 12:02 [PATCH 0/5] ARM: Start working on tools Ian Campbell
2012-01-16 12:15 ` [XenARM] " Ian Campbell
2012-01-16 12:16 ` [PATCH 1/5] arm: add stub hvm/save.h Ian Campbell
2012-01-16 12:16 ` [PATCH 2/5] arm: allow libxc to build (untested) Ian Campbell
2012-01-16 18:01 ` Stefano Stabellini
2012-01-16 12:16 ` Ian Campbell [this message]
2012-01-16 12:16 ` [PATCH 4/5] blktap2/libvhd: Build shared objects using -fPIC Ian Campbell
2012-01-16 12:16 ` [PATCH 5/5] DO-NOT-APPLY: Hackily remove bits which don't (yet) build on ARM 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=1326716171-4298-3-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=stefano.stabellini@citrix.com \
--cc=xen-arm@lists.xensource.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).