From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Williamson <alex.williamson@hp.com>
Subject: [PATCH][qemu] fix ia64
Date: Fri, 28 Jul 2006 06:39:38 -0600
Message-ID: <1154090378.5636.34.camel@lappy>
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Christian Limpach <Christian.Limpach@xensource.com>
Cc: xen-devel <xen-devel@lists.xensource.com>, xen-ia64-devel <xen-ia64-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

Hi Christian,

   This patch adds back changes lost from xen-ia64 cset
10570:8dc4af3f192c7c1ef3cd6921196997b903d25add with the new qemu tree.
This is necessary for ia64 VTi support.  Thanks,

	Alex

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r 7ee2c02c6db0 tools/ioemu/vl.c
--- a/tools/ioemu/vl.c	Fri Jul 28 11:10:08 2006 +0100
+++ b/tools/ioemu/vl.c	Fri Jul 28 06:32:50 2006 -0600
@@ -5792,7 +5792,7 @@ int main(int argc, char **argv)
     }
 
     if (xc_ia64_get_pfn_list(xc_handle, domid, page_array,
-                             nr_pages + (GFW_SIZE >> PAGE_SHIFT), 1)!= 1){
+                             IO_PAGE_START >> PAGE_SHIFT, 1) != 1) {
         fprintf(logfile, "xc_ia64_get_pfn_list returned error %d\n", errno);
         exit(-1);
     }
@@ -5801,7 +5801,7 @@ int main(int argc, char **argv)
                                        PROT_READ|PROT_WRITE,
                                        page_array[0]);
 
-    fprintf(logfile, "shared page at pfn:%lx, mfn: %l016x\n",
+    fprintf(logfile, "shared page at pfn:%lx, mfn: %016lx\n",
             IO_PAGE_START >> PAGE_SHIFT, page_array[0]);
 #endif
 #else  /* !CONFIG_DM */