ia64/xen-unstable

changeset 15080:22c5695b7c73

[qemu patches] Update patches upto changeset 15040:090ca10cb543.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author Christian Limpach <Christian.Limpach@xensource.com>
date Fri May 11 10:07:06 2007 +0100 (2007-05-11)
parents 090ca10cb543
children b47488b17279
files tools/ioemu/patches/domain-timeoffset tools/ioemu/patches/ioemu-ia64 tools/ioemu/patches/ioemu-save-restore-logdirty tools/ioemu/patches/qemu-dm tools/ioemu/patches/qemu-target-i386-dm tools/ioemu/patches/xen-mapcache
line diff
     1.1 --- a/tools/ioemu/patches/domain-timeoffset	Fri May 11 10:06:19 2007 +0100
     1.2 +++ b/tools/ioemu/patches/domain-timeoffset	Fri May 11 10:07:06 2007 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: ioemu/vl.c
     1.5  ===================================================================
     1.6 ---- ioemu.orig/vl.c	2007-05-10 16:04:24.000000000 +0100
     1.7 -+++ ioemu/vl.c	2007-05-10 16:04:24.000000000 +0100
     1.8 +--- ioemu.orig/vl.c	2007-05-11 10:04:50.000000000 +0100
     1.9 ++++ ioemu/vl.c	2007-05-11 10:04:50.000000000 +0100
    1.10  @@ -7530,6 +7530,9 @@
    1.11       }
    1.12       free(page_array);
    1.13 @@ -14,8 +14,8 @@ Index: ioemu/vl.c
    1.14       phys_ram_base = qemu_vmalloc(phys_ram_size);
    1.15  Index: ioemu/vl.h
    1.16  ===================================================================
    1.17 ---- ioemu.orig/vl.h	2007-05-10 16:04:24.000000000 +0100
    1.18 -+++ ioemu/vl.h	2007-05-10 16:04:24.000000000 +0100
    1.19 +--- ioemu.orig/vl.h	2007-05-11 10:04:50.000000000 +0100
    1.20 ++++ ioemu/vl.h	2007-05-11 10:04:50.000000000 +0100
    1.21  @@ -1433,6 +1433,10 @@
    1.22   int xenstore_vm_write(int domid, char *key, char *val);
    1.23   char *xenstore_vm_read(int domid, char *key, int *len);
    1.24 @@ -29,8 +29,8 @@ Index: ioemu/vl.h
    1.25   extern char domain_name[];
    1.26  Index: ioemu/target-i386-dm/helper2.c
    1.27  ===================================================================
    1.28 ---- ioemu.orig/target-i386-dm/helper2.c	2007-05-10 16:04:22.000000000 +0100
    1.29 -+++ ioemu/target-i386-dm/helper2.c	2007-05-10 16:04:24.000000000 +0100
    1.30 +--- ioemu.orig/target-i386-dm/helper2.c	2007-05-11 10:04:48.000000000 +0100
    1.31 ++++ ioemu/target-i386-dm/helper2.c	2007-05-11 10:04:50.000000000 +0100
    1.32  @@ -74,6 +74,8 @@
    1.33   
    1.34   int xc_handle;
     2.1 --- a/tools/ioemu/patches/ioemu-ia64	Fri May 11 10:06:19 2007 +0100
     2.2 +++ b/tools/ioemu/patches/ioemu-ia64	Fri May 11 10:07:06 2007 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  Index: ioemu/hw/iommu.c
     2.5  ===================================================================
     2.6 ---- ioemu.orig/hw/iommu.c	2007-05-10 15:49:26.000000000 +0100
     2.7 -+++ ioemu/hw/iommu.c	2007-05-10 15:49:53.000000000 +0100
     2.8 +--- ioemu.orig/hw/iommu.c	2007-05-11 10:00:33.000000000 +0100
     2.9 ++++ ioemu/hw/iommu.c	2007-05-11 10:01:09.000000000 +0100
    2.10  @@ -82,7 +82,11 @@
    2.11   #define IOPTE_VALID         0x00000002 /* IOPTE is valid */
    2.12   #define IOPTE_WAZ           0x00000001 /* Write as zeros */
    2.13 @@ -16,8 +16,8 @@ Index: ioemu/hw/iommu.c
    2.14   
    2.15  Index: ioemu/vl.c
    2.16  ===================================================================
    2.17 ---- ioemu.orig/vl.c	2007-05-10 15:49:53.000000000 +0100
    2.18 -+++ ioemu/vl.c	2007-05-10 15:54:48.000000000 +0100
    2.19 +--- ioemu.orig/vl.c	2007-05-11 10:01:09.000000000 +0100
    2.20 ++++ ioemu/vl.c	2007-05-11 10:01:09.000000000 +0100
    2.21  @@ -7149,6 +7149,11 @@
    2.22       }
    2.23   #endif
    2.24 @@ -77,8 +77,8 @@ Index: ioemu/vl.c
    2.25       phys_ram_base = qemu_vmalloc(phys_ram_size);
    2.26  Index: ioemu/target-i386-dm/cpu.h
    2.27  ===================================================================
    2.28 ---- ioemu.orig/target-i386-dm/cpu.h	2007-05-10 15:49:26.000000000 +0100
    2.29 -+++ ioemu/target-i386-dm/cpu.h	2007-05-10 15:54:46.000000000 +0100
    2.30 +--- ioemu.orig/target-i386-dm/cpu.h	2007-05-11 10:01:09.000000000 +0100
    2.31 ++++ ioemu/target-i386-dm/cpu.h	2007-05-11 10:01:09.000000000 +0100
    2.32  @@ -78,7 +78,11 @@
    2.33   /* helper2.c */
    2.34   int main_loop(void);
     3.1 --- a/tools/ioemu/patches/ioemu-save-restore-logdirty	Fri May 11 10:06:19 2007 +0100
     3.2 +++ b/tools/ioemu/patches/ioemu-save-restore-logdirty	Fri May 11 10:07:06 2007 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  Index: ioemu/xenstore.c
     3.5  ===================================================================
     3.6 ---- ioemu.orig/xenstore.c	2007-05-03 20:38:53.000000000 +0100
     3.7 -+++ ioemu/xenstore.c	2007-05-03 20:49:57.000000000 +0100
     3.8 +--- ioemu.orig/xenstore.c	2007-05-11 10:04:51.000000000 +0100
     3.9 ++++ ioemu/xenstore.c	2007-05-11 10:04:52.000000000 +0100
    3.10  @@ -11,6 +11,11 @@
    3.11   #include "vl.h"
    3.12   #include "block_int.h"
    3.13 @@ -155,9 +155,9 @@ Index: ioemu/xenstore.c
    3.14           goto out;
    3.15  Index: ioemu/target-i386-dm/exec-dm.c
    3.16  ===================================================================
    3.17 ---- ioemu.orig/target-i386-dm/exec-dm.c	2007-05-03 20:49:54.000000000 +0100
    3.18 -+++ ioemu/target-i386-dm/exec-dm.c	2007-05-03 20:49:57.000000000 +0100
    3.19 -@@ -431,6 +431,9 @@
    3.20 +--- ioemu.orig/target-i386-dm/exec-dm.c	2007-05-11 10:04:52.000000000 +0100
    3.21 ++++ ioemu/target-i386-dm/exec-dm.c	2007-05-11 10:04:52.000000000 +0100
    3.22 +@@ -436,6 +436,9 @@
    3.23   #define phys_ram_addr(x) ((addr < ram_size) ? (phys_ram_base + (x)) : NULL)
    3.24   #endif
    3.25   
    3.26 @@ -167,7 +167,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
    3.27   void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf, 
    3.28                               int len, int is_write)
    3.29   {
    3.30 -@@ -466,8 +469,19 @@
    3.31 +@@ -471,8 +474,19 @@
    3.32                       l = 1;
    3.33                   }
    3.34               } else if ((ptr = phys_ram_addr(addr)) != NULL) {
     4.1 --- a/tools/ioemu/patches/qemu-dm	Fri May 11 10:06:19 2007 +0100
     4.2 +++ b/tools/ioemu/patches/qemu-dm	Fri May 11 10:07:06 2007 +0100
     4.3 @@ -1,7 +1,7 @@
     4.4  Index: ioemu/Makefile.target
     4.5  ===================================================================
     4.6 ---- ioemu.orig/Makefile.target	2007-05-10 15:36:06.000000000 +0100
     4.7 -+++ ioemu/Makefile.target	2007-05-10 15:56:20.000000000 +0100
     4.8 +--- ioemu.orig/Makefile.target	2007-05-10 16:22:45.000000000 +0100
     4.9 ++++ ioemu/Makefile.target	2007-05-11 10:00:33.000000000 +0100
    4.10  @@ -332,7 +332,7 @@
    4.11   endif
    4.12   
    4.13 @@ -13,8 +13,8 @@ Index: ioemu/Makefile.target
    4.14   VL_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o block-dmg.o block-bochs.o block-vpc.o block-vvfat.o block-qcow2.o
    4.15  Index: ioemu/configure
    4.16  ===================================================================
    4.17 ---- ioemu.orig/configure	2007-05-10 15:36:06.000000000 +0100
    4.18 -+++ ioemu/configure	2007-05-10 15:56:20.000000000 +0100
    4.19 +--- ioemu.orig/configure	2007-05-10 16:22:45.000000000 +0100
    4.20 ++++ ioemu/configure	2007-05-11 10:00:33.000000000 +0100
    4.21  @@ -77,8 +77,8 @@
    4.22   bigendian="no"
    4.23   mingw32="no"
    4.24 @@ -37,8 +37,8 @@ Index: ioemu/configure
    4.25     target_user_only="yes"
    4.26  Index: ioemu/cpu-all.h
    4.27  ===================================================================
    4.28 ---- ioemu.orig/cpu-all.h	2007-05-10 15:36:04.000000000 +0100
    4.29 -+++ ioemu/cpu-all.h	2007-05-10 15:56:20.000000000 +0100
    4.30 +--- ioemu.orig/cpu-all.h	2007-05-10 16:22:44.000000000 +0100
    4.31 ++++ ioemu/cpu-all.h	2007-05-11 10:00:33.000000000 +0100
    4.32  @@ -690,7 +690,9 @@
    4.33   void page_set_flags(target_ulong start, target_ulong end, int flags);
    4.34   void page_unprotect_range(target_ulong data, target_ulong data_size);
    4.35 @@ -64,8 +64,8 @@ Index: ioemu/cpu-all.h
    4.36   void cpu_dump_state(CPUState *env, FILE *f, 
    4.37  Index: ioemu/disas.h
    4.38  ===================================================================
    4.39 ---- ioemu.orig/disas.h	2007-05-10 15:36:04.000000000 +0100
    4.40 -+++ ioemu/disas.h	2007-05-10 15:36:06.000000000 +0100
    4.41 +--- ioemu.orig/disas.h	2007-05-10 16:22:44.000000000 +0100
    4.42 ++++ ioemu/disas.h	2007-05-10 16:22:45.000000000 +0100
    4.43  @@ -1,6 +1,7 @@
    4.44   #ifndef _QEMU_DISAS_H
    4.45   #define _QEMU_DISAS_H
    4.46 @@ -83,25 +83,9 @@ Index: ioemu/disas.h
    4.47   #endif /* _QEMU_DISAS_H */
    4.48  Index: ioemu/exec-all.h
    4.49  ===================================================================
    4.50 ---- ioemu.orig/exec-all.h	2007-05-10 15:36:04.000000000 +0100
    4.51 -+++ ioemu/exec-all.h	2007-05-10 15:56:40.000000000 +0100
    4.52 -@@ -357,6 +357,7 @@
    4.53 - extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4];
    4.54 - extern void *io_mem_opaque[IO_MEM_NB_ENTRIES];
    4.55 - 
    4.56 -+#ifndef CONFIG_DM
    4.57 - #ifdef __powerpc__
    4.58 - static inline int testandset (int *p)
    4.59 - {
    4.60 -@@ -480,6 +481,7 @@
    4.61 -     return __sync_lock_test_and_set (p, 1);
    4.62 - }
    4.63 - #endif
    4.64 -+#endif /* !CONFIG_DM */
    4.65 - 
    4.66 - typedef int spinlock_t;
    4.67 - 
    4.68 -@@ -519,7 +521,7 @@
    4.69 +--- ioemu.orig/exec-all.h	2007-05-10 16:22:44.000000000 +0100
    4.70 ++++ ioemu/exec-all.h	2007-05-11 10:00:54.000000000 +0100
    4.71 +@@ -519,7 +519,7 @@
    4.72   
    4.73   extern int tb_invalidated_flag;
    4.74   
    4.75 @@ -110,7 +94,7 @@ Index: ioemu/exec-all.h
    4.76   
    4.77   void tlb_fill(target_ulong addr, int is_write, int is_user, 
    4.78                 void *retaddr);
    4.79 -@@ -546,7 +548,7 @@
    4.80 +@@ -546,7 +546,7 @@
    4.81   
    4.82   #endif
    4.83   
    4.84 @@ -121,8 +105,8 @@ Index: ioemu/exec-all.h
    4.85       return addr;
    4.86  Index: ioemu/hw/pc.c
    4.87  ===================================================================
    4.88 ---- ioemu.orig/hw/pc.c	2007-05-10 15:36:04.000000000 +0100
    4.89 -+++ ioemu/hw/pc.c	2007-05-10 15:56:20.000000000 +0100
    4.90 +--- ioemu.orig/hw/pc.c	2007-05-10 16:22:44.000000000 +0100
    4.91 ++++ ioemu/hw/pc.c	2007-05-11 10:00:33.000000000 +0100
    4.92  @@ -74,6 +74,7 @@
    4.93       }
    4.94   }
    4.95 @@ -184,8 +168,8 @@ Index: ioemu/hw/pc.c
    4.96           if (serial_hds[i]) {
    4.97  Index: ioemu/hw/vga_int.h
    4.98  ===================================================================
    4.99 ---- ioemu.orig/hw/vga_int.h	2007-05-10 15:36:04.000000000 +0100
   4.100 -+++ ioemu/hw/vga_int.h	2007-05-10 15:56:19.000000000 +0100
   4.101 +--- ioemu.orig/hw/vga_int.h	2007-05-10 16:22:44.000000000 +0100
   4.102 ++++ ioemu/hw/vga_int.h	2007-05-11 10:00:32.000000000 +0100
   4.103  @@ -28,7 +28,7 @@
   4.104   #define ST01_DISP_ENABLE    0x01
   4.105   
   4.106 @@ -197,8 +181,8 @@ Index: ioemu/hw/vga_int.h
   4.107   #define VBE_DISPI_MAX_YRES              1200
   4.108  Index: ioemu/monitor.c
   4.109  ===================================================================
   4.110 ---- ioemu.orig/monitor.c	2007-05-10 15:36:04.000000000 +0100
   4.111 -+++ ioemu/monitor.c	2007-05-10 15:56:20.000000000 +0100
   4.112 +--- ioemu.orig/monitor.c	2007-05-10 16:22:44.000000000 +0100
   4.113 ++++ ioemu/monitor.c	2007-05-11 10:00:33.000000000 +0100
   4.114  @@ -69,6 +69,12 @@
   4.115   
   4.116   void term_flush(void)
   4.117 @@ -440,8 +424,8 @@ Index: ioemu/monitor.c
   4.118   {
   4.119  Index: ioemu/vl.c
   4.120  ===================================================================
   4.121 ---- ioemu.orig/vl.c	2007-05-10 15:36:04.000000000 +0100
   4.122 -+++ ioemu/vl.c	2007-05-10 15:56:20.000000000 +0100
   4.123 +--- ioemu.orig/vl.c	2007-05-10 16:22:44.000000000 +0100
   4.124 ++++ ioemu/vl.c	2007-05-11 10:00:33.000000000 +0100
   4.125  @@ -396,12 +396,15 @@
   4.126   void hw_error(const char *fmt, ...)
   4.127   {
     5.1 --- a/tools/ioemu/patches/qemu-target-i386-dm	Fri May 11 10:06:19 2007 +0100
     5.2 +++ b/tools/ioemu/patches/qemu-target-i386-dm	Fri May 11 10:07:06 2007 +0100
     5.3 @@ -1,7 +1,7 @@
     5.4  Index: ioemu/Makefile.target
     5.5  ===================================================================
     5.6 ---- ioemu.orig/Makefile.target	2007-05-09 14:08:42.000000000 +0100
     5.7 -+++ ioemu/Makefile.target	2007-05-09 14:09:10.000000000 +0100
     5.8 +--- ioemu.orig/Makefile.target	2007-05-11 10:00:33.000000000 +0100
     5.9 ++++ ioemu/Makefile.target	2007-05-11 10:04:05.000000000 +0100
    5.10  @@ -65,6 +65,8 @@
    5.11   QEMU_SYSTEM=qemu-fast
    5.12   endif
    5.13 @@ -32,8 +32,8 @@ Index: ioemu/Makefile.target
    5.14   CPPFLAGS += -DHAS_AUDIO
    5.15  Index: ioemu/configure
    5.16  ===================================================================
    5.17 ---- ioemu.orig/configure	2007-05-09 14:08:42.000000000 +0100
    5.18 -+++ ioemu/configure	2007-05-09 14:09:10.000000000 +0100
    5.19 +--- ioemu.orig/configure	2007-05-11 10:00:33.000000000 +0100
    5.20 ++++ ioemu/configure	2007-05-11 10:04:04.000000000 +0100
    5.21  @@ -426,6 +426,8 @@
    5.22       if [ "$darwin_user" = "yes" ] ; then
    5.23           target_list="i386-darwin-user ppc-darwin-user $target_list"
    5.24 @@ -45,8 +45,8 @@ Index: ioemu/configure
    5.25   fi
    5.26  Index: ioemu/monitor.c
    5.27  ===================================================================
    5.28 ---- ioemu.orig/monitor.c	2007-05-09 14:08:59.000000000 +0100
    5.29 -+++ ioemu/monitor.c	2007-05-09 14:09:10.000000000 +0100
    5.30 +--- ioemu.orig/monitor.c	2007-05-11 10:00:33.000000000 +0100
    5.31 ++++ ioemu/monitor.c	2007-05-11 10:04:06.000000000 +0100
    5.32  @@ -1325,6 +1325,10 @@
    5.33         "", "show which guest mouse is receiving events" },
    5.34       { "vnc", "", do_info_vnc,
    5.35 @@ -60,8 +60,8 @@ Index: ioemu/monitor.c
    5.36   
    5.37  Index: ioemu/vl.c
    5.38  ===================================================================
    5.39 ---- ioemu.orig/vl.c	2007-05-09 14:08:42.000000000 +0100
    5.40 -+++ ioemu/vl.c	2007-05-09 14:09:10.000000000 +0100
    5.41 +--- ioemu.orig/vl.c	2007-05-11 10:00:33.000000000 +0100
    5.42 ++++ ioemu/vl.c	2007-05-11 10:04:06.000000000 +0100
    5.43  @@ -88,7 +88,7 @@
    5.44   
    5.45   #include "exec-all.h"
    5.46 @@ -98,8 +98,8 @@ Index: ioemu/vl.c
    5.47   {
    5.48  Index: ioemu/vl.h
    5.49  ===================================================================
    5.50 ---- ioemu.orig/vl.h	2007-05-09 14:08:42.000000000 +0100
    5.51 -+++ ioemu/vl.h	2007-05-09 14:09:10.000000000 +0100
    5.52 +--- ioemu.orig/vl.h	2007-05-11 10:00:33.000000000 +0100
    5.53 ++++ ioemu/vl.h	2007-05-11 10:04:06.000000000 +0100
    5.54  @@ -37,6 +37,8 @@
    5.55   #include <unistd.h>
    5.56   #include <fcntl.h>
    5.57 @@ -132,7 +132,7 @@ Index: ioemu/vl.h
    5.58  Index: ioemu/target-i386-dm/cpu.h
    5.59  ===================================================================
    5.60  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    5.61 -+++ ioemu/target-i386-dm/cpu.h	2007-05-09 14:09:10.000000000 +0100
    5.62 ++++ ioemu/target-i386-dm/cpu.h	2007-05-11 10:04:06.000000000 +0100
    5.63  @@ -0,0 +1,84 @@
    5.64  +/*
    5.65  + * i386 virtual CPU header
    5.66 @@ -221,8 +221,8 @@ Index: ioemu/target-i386-dm/cpu.h
    5.67  Index: ioemu/target-i386-dm/exec-dm.c
    5.68  ===================================================================
    5.69  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    5.70 -+++ ioemu/target-i386-dm/exec-dm.c	2007-05-09 14:09:10.000000000 +0100
    5.71 -@@ -0,0 +1,540 @@
    5.72 ++++ ioemu/target-i386-dm/exec-dm.c	2007-05-11 10:04:04.000000000 +0100
    5.73 +@@ -0,0 +1,545 @@
    5.74  +/*
    5.75  + *  virtual page mapping and translated block handling
    5.76  + * 
    5.77 @@ -569,6 +569,11 @@ Index: ioemu/target-i386-dm/exec-dm.c
    5.78  +}
    5.79  +
    5.80  +#ifdef __ia64__
    5.81 ++
    5.82 ++#define __ia64_fc(addr)	asm volatile ("fc %0" :: "r"(addr) : "memory")
    5.83 ++#define ia64_sync_i()	asm volatile (";; sync.i" ::: "memory")
    5.84 ++#define ia64_srlz_i()	asm volatile (";; srlz.i ;;" ::: "memory")
    5.85 ++
    5.86  +/* IA64 has seperate I/D cache, with coherence maintained by DMA controller.
    5.87  + * So to emulate right behavior that guest OS is assumed, we need to flush
    5.88  + * I/D cache here.
    5.89 @@ -766,7 +771,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
    5.90  Index: ioemu/target-i386-dm/helper2.c
    5.91  ===================================================================
    5.92  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    5.93 -+++ ioemu/target-i386-dm/helper2.c	2007-05-09 14:09:10.000000000 +0100
    5.94 ++++ ioemu/target-i386-dm/helper2.c	2007-05-11 10:04:05.000000000 +0100
    5.95  @@ -0,0 +1,542 @@
    5.96  +/*
    5.97  + *  i386 helpers (without register variable usage)
    5.98 @@ -1313,7 +1318,7 @@ Index: ioemu/target-i386-dm/helper2.c
    5.99  Index: ioemu/target-i386-dm/i8259-dm.c
   5.100  ===================================================================
   5.101  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
   5.102 -+++ ioemu/target-i386-dm/i8259-dm.c	2007-05-09 14:09:10.000000000 +0100
   5.103 ++++ ioemu/target-i386-dm/i8259-dm.c	2007-05-11 10:04:04.000000000 +0100
   5.104  @@ -0,0 +1,67 @@
   5.105  +/* Xen 8259 stub for interrupt controller emulation
   5.106  + * 
   5.107 @@ -1385,7 +1390,7 @@ Index: ioemu/target-i386-dm/i8259-dm.c
   5.108  Index: ioemu/target-i386-dm/qemu-dm.debug
   5.109  ===================================================================
   5.110  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
   5.111 -+++ ioemu/target-i386-dm/qemu-dm.debug	2007-05-09 14:09:10.000000000 +0100
   5.112 ++++ ioemu/target-i386-dm/qemu-dm.debug	2007-05-11 10:01:09.000000000 +0100
   5.113  @@ -0,0 +1,10 @@
   5.114  +#!/bin/sh
   5.115  +
   5.116 @@ -1400,7 +1405,7 @@ Index: ioemu/target-i386-dm/qemu-dm.debu
   5.117  Index: ioemu/target-i386-dm/qemu-ifup
   5.118  ===================================================================
   5.119  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
   5.120 -+++ ioemu/target-i386-dm/qemu-ifup	2007-05-09 14:09:10.000000000 +0100
   5.121 ++++ ioemu/target-i386-dm/qemu-ifup	2007-05-11 10:01:09.000000000 +0100
   5.122  @@ -0,0 +1,9 @@
   5.123  +#!/bin/sh
   5.124  +
     6.1 --- a/tools/ioemu/patches/xen-mapcache	Fri May 11 10:06:19 2007 +0100
     6.2 +++ b/tools/ioemu/patches/xen-mapcache	Fri May 11 10:07:06 2007 +0100
     6.3 @@ -17,8 +17,8 @@ Signed-off-by: Keir Fraser <keir@xensour
     6.4  
     6.5  Index: ioemu/vl.c
     6.6  ===================================================================
     6.7 ---- ioemu.orig/vl.c	2007-05-10 15:35:25.000000000 +0100
     6.8 -+++ ioemu/vl.c	2007-05-10 15:35:25.000000000 +0100
     6.9 +--- ioemu.orig/vl.c	2007-05-11 10:04:51.000000000 +0100
    6.10 ++++ ioemu/vl.c	2007-05-11 10:04:52.000000000 +0100
    6.11  @@ -275,7 +275,7 @@
    6.12       for(i = start; i < start + length; i += size) {
    6.13           ioport_read_table[bsize][i] = func;
    6.14 @@ -260,8 +260,8 @@ Index: ioemu/vl.c
    6.15       nr_pages = ram_size/PAGE_SIZE;
    6.16  Index: ioemu/target-i386-dm/exec-dm.c
    6.17  ===================================================================
    6.18 ---- ioemu.orig/target-i386-dm/exec-dm.c	2007-05-10 15:32:53.000000000 +0100
    6.19 -+++ ioemu/target-i386-dm/exec-dm.c	2007-05-10 15:35:25.000000000 +0100
    6.20 +--- ioemu.orig/target-i386-dm/exec-dm.c	2007-05-11 10:04:46.000000000 +0100
    6.21 ++++ ioemu/target-i386-dm/exec-dm.c	2007-05-11 10:04:52.000000000 +0100
    6.22  @@ -36,6 +36,7 @@
    6.23   
    6.24   #include "cpu.h"
    6.25 @@ -303,7 +303,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
    6.26   }
    6.27   
    6.28   /* enable or disable low levels log */
    6.29 -@@ -409,16 +425,11 @@
    6.30 +@@ -414,16 +430,11 @@
    6.31           return 0;
    6.32   }
    6.33   
    6.34 @@ -324,7 +324,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
    6.35   
    6.36   void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf, 
    6.37                               int len, int is_write)
    6.38 -@@ -426,13 +437,15 @@
    6.39 +@@ -431,13 +442,15 @@
    6.40       int l, io_index;
    6.41       uint8_t *ptr;
    6.42       uint32_t val;
    6.43 @@ -342,7 +342,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
    6.44           io_index = iomem_index(addr);
    6.45           if (is_write) {
    6.46               if (io_index) {
    6.47 -@@ -452,11 +465,11 @@
    6.48 +@@ -457,11 +470,11 @@
    6.49                       io_mem_write[io_index][0](io_mem_opaque[io_index], addr, val);
    6.50                       l = 1;
    6.51                   }
    6.52 @@ -357,7 +357,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
    6.53   #endif 
    6.54               }
    6.55           } else {
    6.56 -@@ -477,9 +490,9 @@
    6.57 +@@ -482,9 +495,9 @@
    6.58                       stb_raw(buf, val);
    6.59                       l = 1;
    6.60                   }
    6.61 @@ -369,7 +369,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
    6.62               } else {
    6.63                   /* Neither RAM nor known MMIO space */
    6.64                   memset(buf, 0xff, len); 
    6.65 -@@ -489,6 +502,8 @@
    6.66 +@@ -494,6 +507,8 @@
    6.67           buf += l;
    6.68           addr += l;
    6.69       }
    6.70 @@ -380,8 +380,8 @@ Index: ioemu/target-i386-dm/exec-dm.c
    6.71   
    6.72  Index: ioemu/vl.h
    6.73  ===================================================================
    6.74 ---- ioemu.orig/vl.h	2007-05-10 15:35:25.000000000 +0100
    6.75 -+++ ioemu/vl.h	2007-05-10 15:35:25.000000000 +0100
    6.76 +--- ioemu.orig/vl.h	2007-05-11 10:04:51.000000000 +0100
    6.77 ++++ ioemu/vl.h	2007-05-11 10:04:52.000000000 +0100
    6.78  @@ -159,6 +159,28 @@
    6.79   
    6.80   extern FILE *logfile;
    6.81 @@ -413,8 +413,8 @@ Index: ioemu/vl.h
    6.82   
    6.83  Index: ioemu/target-i386-dm/cpu.h
    6.84  ===================================================================
    6.85 ---- ioemu.orig/target-i386-dm/cpu.h	2007-05-10 15:32:53.000000000 +0100
    6.86 -+++ ioemu/target-i386-dm/cpu.h	2007-05-10 15:35:25.000000000 +0100
    6.87 +--- ioemu.orig/target-i386-dm/cpu.h	2007-05-11 10:04:47.000000000 +0100
    6.88 ++++ ioemu/target-i386-dm/cpu.h	2007-05-11 10:04:52.000000000 +0100
    6.89  @@ -25,7 +25,8 @@
    6.90   #ifdef TARGET_X86_64
    6.91   #define TARGET_LONG_BITS 64
    6.92 @@ -427,8 +427,8 @@ Index: ioemu/target-i386-dm/cpu.h
    6.93   /* target supports implicit self modifying code */
    6.94  Index: ioemu/target-i386-dm/helper2.c
    6.95  ===================================================================
    6.96 ---- ioemu.orig/target-i386-dm/helper2.c	2007-05-10 15:34:24.000000000 +0100
    6.97 -+++ ioemu/target-i386-dm/helper2.c	2007-05-10 15:35:25.000000000 +0100
    6.98 +--- ioemu.orig/target-i386-dm/helper2.c	2007-05-11 10:04:50.000000000 +0100
    6.99 ++++ ioemu/target-i386-dm/helper2.c	2007-05-11 10:04:52.000000000 +0100
   6.100  @@ -526,6 +526,9 @@
   6.101       case IOREQ_TYPE_TIMEOFFSET:
   6.102           cpu_ioreq_timeoffset(env, req);