diff options
| author | Hollis Blanchard <hollisb@us.ibm.com> | 2006-11-29 14:16:36 -0600 |
|---|---|---|
| committer | Hollis Blanchard <hollisb@us.ibm.com> | 2006-11-29 14:16:36 -0600 |
| commit | ab26a6a563a0acb589af87a8e063c0e171d75665 (patch) | |
| tree | 71a432bde5d016e928ab3ad7860fca01312ec787 /tools/ioemu/patches/xen-support-buffered-ioreqs | |
| parent | d3be8a6ca1aa9312cc01e780a2fea56ab8ec12b4 (diff) | |
| parent | 1c804664cf63f0c2e80d0420e52d5f82c3956685 (diff) | |
| download | xen-ab26a6a563a0acb589af87a8e063c0e171d75665.tar.gz xen-ab26a6a563a0acb589af87a8e063c0e171d75665.tar.bz2 xen-ab26a6a563a0acb589af87a8e063c0e171d75665.zip | |
Merge with xen-unstable.hg.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Diffstat (limited to 'tools/ioemu/patches/xen-support-buffered-ioreqs')
| -rw-r--r-- | tools/ioemu/patches/xen-support-buffered-ioreqs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/ioemu/patches/xen-support-buffered-ioreqs b/tools/ioemu/patches/xen-support-buffered-ioreqs index 77ed854258..7865dda35b 100644 --- a/tools/ioemu/patches/xen-support-buffered-ioreqs +++ b/tools/ioemu/patches/xen-support-buffered-ioreqs @@ -1,8 +1,8 @@ Index: ioemu/vl.c =================================================================== ---- ioemu.orig/vl.c 2006-08-17 19:50:22.277673633 +0100 -+++ ioemu/vl.c 2006-08-17 19:55:21.878556486 +0100 -@@ -5838,6 +5838,7 @@ +--- ioemu.orig/vl.c 2006-10-24 14:33:47.000000000 +0100 ++++ ioemu/vl.c 2006-10-24 14:33:47.000000000 +0100 +@@ -5854,6 +5854,7 @@ unsigned long nr_pages, tmp_nr_pages, shared_page_nr; xen_pfn_t *page_array; extern void *shared_page; @@ -10,7 +10,7 @@ Index: ioemu/vl.c char qemu_dm_logfilename[64]; -@@ -6419,6 +6420,18 @@ +@@ -6440,6 +6441,18 @@ fprintf(logfile, "shared page at pfn:%lx, mfn: %"PRIx64"\n", shared_page_nr, (uint64_t)(page_array[shared_page_nr])); @@ -31,8 +31,8 @@ Index: ioemu/vl.c #elif defined(__ia64__) Index: ioemu/target-i386-dm/helper2.c =================================================================== ---- ioemu.orig/target-i386-dm/helper2.c 2006-08-17 19:49:44.491850141 +0100 -+++ ioemu/target-i386-dm/helper2.c 2006-08-17 19:50:41.490549986 +0100 +--- ioemu.orig/target-i386-dm/helper2.c 2006-10-24 14:33:45.000000000 +0100 ++++ ioemu/target-i386-dm/helper2.c 2006-10-24 14:33:47.000000000 +0100 @@ -76,6 +76,10 @@ shared_iopage_t *shared_page = NULL; |