[Xen-changelog] [xen-unstable] qemu: Remove mapcache lock - we no longer have multiple threads in core qemu code.

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1188484510 -3600
# Node ID 3805cc382dbe9d16571e44bda5e575709fb8fd17
# Parent  23bf79231e125d7e9717f11baaf3125fc7e862e1
qemu: Remove mapcache lock - we no longer have multiple threads in core qemu 
code.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 tools/ioemu/Makefile.target          |    1 -
 tools/ioemu/target-i386-dm/exec-dm.c |   15 ---------------
 tools/ioemu/vl.h                     |   12 +-----------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff -r 23bf79231e12 -r 3805cc382dbe tools/ioemu/Makefile.target
--- a/tools/ioemu/Makefile.target       Thu Aug 30 15:00:49 2007 +0100
+++ b/tools/ioemu/Makefile.target       Thu Aug 30 15:35:10 2007 +0100
@@ -197,7 +197,6 @@ LIBS+=-lm
 LIBS+=-lm
 LIBS+=-L../../libxc -lxenctrl -lxenguest
 LIBS+=-L../../xenstore -lxenstore
-LIBS+=-lpthread
 ifndef CONFIG_USER_ONLY
 LIBS+=-lz
 endif
diff -r 23bf79231e12 -r 3805cc382dbe tools/ioemu/target-i386-dm/exec-dm.c
--- a/tools/ioemu/target-i386-dm/exec-dm.c      Thu Aug 30 15:00:49 2007 +0100
+++ b/tools/ioemu/target-i386-dm/exec-dm.c      Thu Aug 30 15:35:10 2007 +0100
@@ -125,17 +125,10 @@ FILE *logfile;
 FILE *logfile;
 int loglevel;
 
-#ifdef MAPCACHE
-pthread_mutex_t mapcache_mutex;
-#endif
-
 void cpu_exec_init(CPUState *env)
 {
     CPUState **penv;
     int cpu_index;
-#ifdef MAPCACHE
-    pthread_mutexattr_t mxattr; 
-#endif
 
     env->next_cpu = NULL;
     penv = &first_cpu;
@@ -149,14 +142,6 @@ void cpu_exec_init(CPUState *env)
 
     /* alloc dirty bits array */
     phys_ram_dirty = qemu_malloc(phys_ram_size >> TARGET_PAGE_BITS);
-
-#ifdef MAPCACHE
-    /* setup memory access mutex to protect mapcache */
-    pthread_mutexattr_init(&mxattr); 
-    pthread_mutexattr_settype(&mxattr, PTHREAD_MUTEX_RECURSIVE);
-    pthread_mutex_init(&mapcache_mutex, &mxattr); 
-    pthread_mutexattr_destroy(&mxattr); 
-#endif
 }
 
 /* enable or disable low levels log */
diff -r 23bf79231e12 -r 3805cc382dbe tools/ioemu/vl.h
--- a/tools/ioemu/vl.h  Thu Aug 30 15:00:49 2007 +0100
+++ b/tools/ioemu/vl.h  Thu Aug 30 15:35:10 2007 +0100
@@ -160,25 +160,15 @@ extern FILE *logfile;
 
 
 #if defined(__i386__) || defined(__x86_64__)
-
 #define MAPCACHE
-
 uint8_t *qemu_map_cache(target_phys_addr_t phys_addr);
 void     qemu_invalidate_map_cache(void);
-
-#include <pthread.h>
-extern  pthread_mutex_t mapcache_mutex;
-#define mapcache_lock() pthread_mutex_lock(&mapcache_mutex)
-#define mapcache_unlock() pthread_mutex_unlock(&mapcache_mutex)
-
 #else 
-
 #define qemu_invalidate_map_cache() ((void)0)
+#endif
 
 #define mapcache_lock()   ((void)0)
 #define mapcache_unlock() ((void)0)
-
-#endif
 
 extern int xc_handle;
 extern int domid;

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