1.1 --- a/tools/libxc/xc_resume.c	Wed Jan 24 10:15:34 2007 +0000
     1.2 +++ b/tools/libxc/xc_resume.c	Wed Jan 24 10:18:44 2007 +0000
     1.3 @@ -43,13 +43,9 @@ static int xc_domain_resume_cooperative(
     1.4  static int xc_domain_resume_any(int xc_handle, uint32_t domid)
     1.5  {
     1.6      DECLARE_DOMCTL;
     1.7 +    xc_dominfo_t info;
     1.8      int i, rc = -1;
     1.9 -
    1.10 -    /*
    1.11 -     * (x86 only) Rewrite store_mfn and console_mfn back to MFN (from PFN).
    1.12 -     */
    1.13  #if defined(__i386__) || defined(__x86_64__)
    1.14 -    xc_dominfo_t info;
    1.15      unsigned long mfn, max_pfn = 0;
    1.16      vcpu_guest_context_t ctxt;
    1.17      start_info_t *start_info;
    1.18 @@ -57,6 +53,7 @@ static int xc_domain_resume_any(int xc_h
    1.19      xen_pfn_t *p2m_frame_list_list = NULL;
    1.20      xen_pfn_t *p2m_frame_list = NULL;
    1.21      xen_pfn_t *p2m = NULL;
    1.22 +#endif
    1.23  
    1.24      if ( xc_domain_getinfo(xc_handle, domid, 1, &info) != 1 )
    1.25      {
    1.26 @@ -64,6 +61,10 @@ static int xc_domain_resume_any(int xc_h
    1.27          goto out;
    1.28      }
    1.29  
    1.30 +    /*
    1.31 +     * (x86 only) Rewrite store_mfn and console_mfn back to MFN (from PFN).
    1.32 +     */
    1.33 +#if defined(__i386__) || defined(__x86_64__)
    1.34      /* Map the shared info frame */
    1.35      shinfo = xc_map_foreign_range(xc_handle, domid, PAGE_SIZE,
    1.36                                    PROT_READ, info.shared_info_frame);