Merge remote-tracking branch 'qemu-kvm/memory/exec-obsolete' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Dec 2011 15:45:17 +0000 (09:45 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Dec 2011 15:45:17 +0000 (09:45 -0600)
1  2 
memory.c

diff --cc memory.c
+++ b/memory.c
  #include "kvm.h"
  #include <assert.h>
  
+ #define WANT_EXEC_OBSOLETE
+ #include "exec-obsolete.h"
  unsigned memory_region_transaction_depth = 0;
 +static bool memory_region_update_pending = false;
  
  typedef struct AddrRange AddrRange;