projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4a1cc68
67d95c1
)
Merge remote-tracking branch 'qemu-kvm/memory/exec-obsolete' into staging
author
Anthony Liguori
<aliguori@us.ibm.com>
Mon, 19 Dec 2011 15:45:17 +0000
(09:45 -0600)
committer
Anthony Liguori
<aliguori@us.ibm.com>
Mon, 19 Dec 2011 15:45:17 +0000
(09:45 -0600)
1
2
memory.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
memory.c
index
37e4f09
,
cbd6988
..
a7e615a
---
1
/
memory.c
---
2
/
memory.c
+++ b/
memory.c
@@@
-18,8
-18,10
+18,11
@@@
#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;