aboutsummaryrefslogtreecommitdiff
path: root/memory.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-12-19 09:45:17 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2011-12-19 09:45:17 -0600
commitf76d27b67ca05c7ee875e39b4f6e3d567d3e9292 (patch)
treed1c923164d9830fa0d8901c2af828ed69b5f243f /memory.c
parent4a1cc6800a54b154a214e7ecf36c63c8c81f2074 (diff)
parent67d95c153bef55f619615ea71a5c2d689db4fd4e (diff)
downloadqemu-f76d27b67ca05c7ee875e39b4f6e3d567d3e9292.zip
qemu-f76d27b67ca05c7ee875e39b4f6e3d567d3e9292.tar.gz
qemu-f76d27b67ca05c7ee875e39b4f6e3d567d3e9292.tar.bz2
Merge remote-tracking branch 'qemu-kvm/memory/exec-obsolete' into staging
Diffstat (limited to 'memory.c')
-rw-r--r--memory.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/memory.c b/memory.c
index 37e4f09..a7e615a 100644
--- a/memory.c
+++ b/memory.c
@@ -18,6 +18,9 @@
#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;