# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1169633924 0
# Node ID b280c75f26225f237acd8e583a67f58d93f7063b
# Parent 19e3f812805ffe0282c23a8630904d5dfdcbdd83
libxenguest: Fix xc_resume() build for non-x86.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
tools/libxc/xc_resume.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff -r 19e3f812805f -r b280c75f2622 tools/libxc/xc_resume.c
--- a/tools/libxc/xc_resume.c Wed Jan 24 10:15:34 2007 +0000
+++ b/tools/libxc/xc_resume.c Wed Jan 24 10:18:44 2007 +0000
@@ -43,13 +43,9 @@ static int xc_domain_resume_any(int xc_h
static int xc_domain_resume_any(int xc_handle, uint32_t domid)
{
DECLARE_DOMCTL;
+ xc_dominfo_t info;
int i, rc = -1;
-
- /*
- * (x86 only) Rewrite store_mfn and console_mfn back to MFN (from PFN).
- */
#if defined(__i386__) || defined(__x86_64__)
- xc_dominfo_t info;
unsigned long mfn, max_pfn = 0;
vcpu_guest_context_t ctxt;
start_info_t *start_info;
@@ -57,6 +53,7 @@ static int xc_domain_resume_any(int xc_h
xen_pfn_t *p2m_frame_list_list = NULL;
xen_pfn_t *p2m_frame_list = NULL;
xen_pfn_t *p2m = NULL;
+#endif
if ( xc_domain_getinfo(xc_handle, domid, 1, &info) != 1 )
{
@@ -64,6 +61,10 @@ static int xc_domain_resume_any(int xc_h
goto out;
}
+ /*
+ * (x86 only) Rewrite store_mfn and console_mfn back to MFN (from PFN).
+ */
+#if defined(__i386__) || defined(__x86_64__)
/* Map the shared info frame */
shinfo = xc_map_foreign_range(xc_handle, domid, PAGE_SIZE,
PROT_READ, info.shared_info_frame);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|