ia64/xen-unstable

changeset 13150:105a54bcc5c9

[qemu patches] Update patches upto changeset 13113:fd1ccd818f2c.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author Christian Limpach <Christian.Limpach@xensource.com>
date Thu Dec 21 11:33:15 2006 +0000 (2006-12-21)
parents fd1ccd818f2c
children 93667f6c5cc8
files tools/ioemu/patches/xen-mapcache
line diff
     1.1 --- a/tools/ioemu/patches/xen-mapcache	Thu Dec 21 11:22:39 2006 +0000
     1.2 +++ b/tools/ioemu/patches/xen-mapcache	Thu Dec 21 11:33:15 2006 +0000
     1.3 @@ -17,8 +17,8 @@ Signed-off-by: Keir Fraser <keir@xensour
     1.4  
     1.5  Index: ioemu/vl.c
     1.6  ===================================================================
     1.7 ---- ioemu.orig/vl.c	2006-12-20 15:12:08.000000000 +0000
     1.8 -+++ ioemu/vl.c	2006-12-20 15:13:00.000000000 +0000
     1.9 +--- ioemu.orig/vl.c	2006-12-20 15:21:55.000000000 +0000
    1.10 ++++ ioemu/vl.c	2006-12-20 15:21:56.000000000 +0000
    1.11  @@ -5808,6 +5808,91 @@
    1.12       return 0;
    1.13   }
    1.14 @@ -186,8 +186,8 @@ Index: ioemu/vl.c
    1.15                                          IO_PAGE_START >> PAGE_SHIFT);
    1.16  Index: ioemu/target-i386-dm/exec-dm.c
    1.17  ===================================================================
    1.18 ---- ioemu.orig/target-i386-dm/exec-dm.c	2006-12-20 15:10:13.000000000 +0000
    1.19 -+++ ioemu/target-i386-dm/exec-dm.c	2006-12-20 15:12:13.000000000 +0000
    1.20 +--- ioemu.orig/target-i386-dm/exec-dm.c	2006-12-20 15:21:42.000000000 +0000
    1.21 ++++ ioemu/target-i386-dm/exec-dm.c	2006-12-21 11:32:29.000000000 +0000
    1.22  @@ -36,6 +36,7 @@
    1.23   
    1.24   #include "cpu.h"
    1.25 @@ -196,7 +196,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
    1.26   
    1.27   //#define DEBUG_TB_INVALIDATE
    1.28   //#define DEBUG_FLUSH
    1.29 -@@ -127,10 +128,28 @@
    1.30 +@@ -127,10 +128,29 @@
    1.31   FILE *logfile;
    1.32   int loglevel;
    1.33   
    1.34 @@ -206,6 +206,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
    1.35  +#endif
    1.36  +
    1.37  +#ifdef MAPCACHE
    1.38 ++#include <pthread.h>
    1.39  +static pthread_mutex_t mapcache_mutex;
    1.40  +#define mapcache_lock() pthread_mutex_lock(&mapcache_mutex)
    1.41  +#define mapcache_unlock() pthread_mutex_unlock(&mapcache_mutex)
    1.42 @@ -225,7 +226,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
    1.43   
    1.44       env->next_cpu = NULL;
    1.45       penv = &first_cpu;
    1.46 -@@ -144,6 +163,14 @@
    1.47 +@@ -144,6 +164,14 @@
    1.48   
    1.49       /* alloc dirty bits array */
    1.50       phys_ram_dirty = qemu_malloc(phys_ram_size >> TARGET_PAGE_BITS);
    1.51 @@ -240,7 +241,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
    1.52   }
    1.53   
    1.54   /* enable or disable low levels log */
    1.55 -@@ -426,19 +453,27 @@
    1.56 +@@ -426,19 +454,27 @@
    1.57   #endif
    1.58   }
    1.59   
    1.60 @@ -270,7 +271,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
    1.61           io_index = iomem_index(addr);
    1.62           if (is_write) {
    1.63               if (io_index) {
    1.64 -@@ -460,9 +495,10 @@
    1.65 +@@ -460,9 +496,10 @@
    1.66                   }
    1.67               } else if (paddr_is_ram(addr)) {
    1.68                   /* Reading from RAM */
    1.69 @@ -283,7 +284,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
    1.70   #endif 
    1.71               }
    1.72           } else {
    1.73 -@@ -485,7 +521,8 @@
    1.74 +@@ -485,7 +522,8 @@
    1.75                   }
    1.76               } else if (paddr_is_ram(addr)) {
    1.77                   /* Reading from RAM */
    1.78 @@ -293,7 +294,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
    1.79               } else {
    1.80                   /* Neither RAM nor known MMIO space */
    1.81                   memset(buf, 0xff, len); 
    1.82 -@@ -495,6 +532,8 @@
    1.83 +@@ -495,6 +533,8 @@
    1.84           buf += l;
    1.85           addr += l;
    1.86       }
    1.87 @@ -304,8 +305,8 @@ Index: ioemu/target-i386-dm/exec-dm.c
    1.88   
    1.89  Index: ioemu/vl.h
    1.90  ===================================================================
    1.91 ---- ioemu.orig/vl.h	2006-12-20 15:12:08.000000000 +0000
    1.92 -+++ ioemu/vl.h	2006-12-20 15:12:13.000000000 +0000
    1.93 +--- ioemu.orig/vl.h	2006-12-20 15:21:55.000000000 +0000
    1.94 ++++ ioemu/vl.h	2006-12-20 15:21:56.000000000 +0000
    1.95  @@ -156,6 +156,26 @@
    1.96   
    1.97   extern FILE *logfile;
    1.98 @@ -335,8 +336,8 @@ Index: ioemu/vl.h
    1.99   
   1.100  Index: ioemu/target-i386-dm/cpu.h
   1.101  ===================================================================
   1.102 ---- ioemu.orig/target-i386-dm/cpu.h	2006-12-20 15:10:13.000000000 +0000
   1.103 -+++ ioemu/target-i386-dm/cpu.h	2006-12-20 15:12:13.000000000 +0000
   1.104 +--- ioemu.orig/target-i386-dm/cpu.h	2006-12-20 15:21:45.000000000 +0000
   1.105 ++++ ioemu/target-i386-dm/cpu.h	2006-12-20 15:21:56.000000000 +0000
   1.106  @@ -25,7 +25,8 @@
   1.107   #ifdef TARGET_X86_64
   1.108   #define TARGET_LONG_BITS 64