From: Anthony Liguori Date: Mon, 19 Dec 2011 15:45:17 +0000 (-0600) Subject: Merge remote-tracking branch 'qemu-kvm/memory/exec-obsolete' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f76d27b67ca05c7ee875e39b4f6e3d567d3e9292;p=qemu.git Merge remote-tracking branch 'qemu-kvm/memory/exec-obsolete' into staging --- f76d27b67ca05c7ee875e39b4f6e3d567d3e9292 diff --cc memory.c index 37e4f0905b,cbd6988ccb..a7e615ad15 --- a/memory.c +++ b/memory.c @@@ -18,8 -18,10 +18,11 @@@ #include "kvm.h" #include + #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;