[Xen-changelog] [xen-unstable] [qemu patches] Update patches upto changeset 13113:fd1ccd818f2c.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
# Date 1166700795 0
# Node ID 105a54bcc5c98582d8d879fbeffa410789483d59
# Parent  fd1ccd818f2c7da431e1e1ce9cc6ea3392f380c1
[qemu patches] Update patches upto changeset 13113:fd1ccd818f2c.

Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
---
 tools/ioemu/patches/xen-mapcache |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff -r fd1ccd818f2c -r 105a54bcc5c9 tools/ioemu/patches/xen-mapcache
--- a/tools/ioemu/patches/xen-mapcache  Thu Dec 21 11:22:39 2006 +0000
+++ b/tools/ioemu/patches/xen-mapcache  Thu Dec 21 11:33:15 2006 +0000
@@ -17,8 +17,8 @@ Signed-off-by: Keir Fraser <keir@xensour
 
 Index: ioemu/vl.c
 ===================================================================
---- ioemu.orig/vl.c    2006-12-20 15:12:08.000000000 +0000
-+++ ioemu/vl.c 2006-12-20 15:13:00.000000000 +0000
+--- ioemu.orig/vl.c    2006-12-20 15:21:55.000000000 +0000
++++ ioemu/vl.c 2006-12-20 15:21:56.000000000 +0000
 @@ -5808,6 +5808,91 @@
      return 0;
  }
@@ -186,8 +186,8 @@ Index: ioemu/vl.c
                                         IO_PAGE_START >> PAGE_SHIFT);
 Index: ioemu/target-i386-dm/exec-dm.c
 ===================================================================
---- ioemu.orig/target-i386-dm/exec-dm.c        2006-12-20 15:10:13.000000000 
+0000
-+++ ioemu/target-i386-dm/exec-dm.c     2006-12-20 15:12:13.000000000 +0000
+--- ioemu.orig/target-i386-dm/exec-dm.c        2006-12-20 15:21:42.000000000 
+0000
++++ ioemu/target-i386-dm/exec-dm.c     2006-12-21 11:32:29.000000000 +0000
 @@ -36,6 +36,7 @@
  
  #include "cpu.h"
@@ -196,7 +196,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
  
  //#define DEBUG_TB_INVALIDATE
  //#define DEBUG_FLUSH
-@@ -127,10 +128,28 @@
+@@ -127,10 +128,29 @@
  FILE *logfile;
  int loglevel;
  
@@ -206,6 +206,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
 +#endif
 +
 +#ifdef MAPCACHE
++#include <pthread.h>
 +static pthread_mutex_t mapcache_mutex;
 +#define mapcache_lock() pthread_mutex_lock(&mapcache_mutex)
 +#define mapcache_unlock() pthread_mutex_unlock(&mapcache_mutex)
@@ -225,7 +226,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
  
      env->next_cpu = NULL;
      penv = &first_cpu;
-@@ -144,6 +163,14 @@
+@@ -144,6 +164,14 @@
  
      /* alloc dirty bits array */
      phys_ram_dirty = qemu_malloc(phys_ram_size >> TARGET_PAGE_BITS);
@@ -240,7 +241,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
  }
  
  /* enable or disable low levels log */
-@@ -426,19 +453,27 @@
+@@ -426,19 +454,27 @@
  #endif
  }
  
@@ -270,7 +271,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
          io_index = iomem_index(addr);
          if (is_write) {
              if (io_index) {
-@@ -460,9 +495,10 @@
+@@ -460,9 +496,10 @@
                  }
              } else if (paddr_is_ram(addr)) {
                  /* Reading from RAM */
@@ -283,7 +284,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
  #endif 
              }
          } else {
-@@ -485,7 +521,8 @@
+@@ -485,7 +522,8 @@
                  }
              } else if (paddr_is_ram(addr)) {
                  /* Reading from RAM */
@@ -293,7 +294,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
              } else {
                  /* Neither RAM nor known MMIO space */
                  memset(buf, 0xff, len); 
-@@ -495,6 +532,8 @@
+@@ -495,6 +533,8 @@
          buf += l;
          addr += l;
      }
@@ -304,8 +305,8 @@ Index: ioemu/target-i386-dm/exec-dm.c
  
 Index: ioemu/vl.h
 ===================================================================
---- ioemu.orig/vl.h    2006-12-20 15:12:08.000000000 +0000
-+++ ioemu/vl.h 2006-12-20 15:12:13.000000000 +0000
+--- ioemu.orig/vl.h    2006-12-20 15:21:55.000000000 +0000
++++ ioemu/vl.h 2006-12-20 15:21:56.000000000 +0000
 @@ -156,6 +156,26 @@
  
  extern FILE *logfile;
@@ -335,8 +336,8 @@ Index: ioemu/vl.h
  
 Index: ioemu/target-i386-dm/cpu.h
 ===================================================================
---- ioemu.orig/target-i386-dm/cpu.h    2006-12-20 15:10:13.000000000 +0000
-+++ ioemu/target-i386-dm/cpu.h 2006-12-20 15:12:13.000000000 +0000
+--- ioemu.orig/target-i386-dm/cpu.h    2006-12-20 15:21:45.000000000 +0000
++++ ioemu/target-i386-dm/cpu.h 2006-12-20 15:21:56.000000000 +0000
 @@ -25,7 +25,8 @@
  #ifdef TARGET_X86_64
  #define TARGET_LONG_BITS 64

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog