From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 3/5] libxl: do not allocate e820 for non x86 guests. Date: Mon, 16 Jan 2012 12:16:08 +0000 Message-ID: <1326716171-4298-3-git-send-email-ian.campbell@citrix.com> References: <1326715371.17210.417.camel@zakaz.uk.xensource.com> <1326716171-4298-1-git-send-email-ian.campbell@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1326716171-4298-1-git-send-email-ian.campbell@citrix.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, xen-arm@lists.xensource.com Cc: stefano.stabellini@citrix.com, Ian Campbell List-Id: xen-devel@lists.xenproject.org Signed-off-by: Ian Campbell --- 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