Failed in applying to current master (
apply log)
Maintainers: Paolo Bonzini <pbonzini@redhat.com>, Pierrick Bouvier <pierrick.bouvier@linaro.org>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Gerd Hoffmann <kraxel@redhat.com>, Artyom Tarasenko <atar4qemu@gmail.com>, Alex Williamson <alex@shazbot.org>, "Cédric Le Goater" <clg@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, David Hildenbrand <david@kernel.org>, Stefano Stabellini <sstabellini@kernel.org>, Anthony PERARD <anthony@xenproject.org>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Max Filippov <jcmvbkbc@gmail.com>, Peter Xu <peterx@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>
docs/devel/memory.rst | 9 +-
.../memory-region-housekeeping.cocci | 47 ---
include/system/memory.h | 101 ++----
include/system/ramblock.h | 28 +-
include/system/xen-mapcache.h | 2 +-
include/system/xen.h | 6 +-
accel/kvm/kvm-all.c | 2 +-
hw/display/cg3.c | 5 +-
hw/display/tcx.c | 8 +-
hw/display/vga.c | 4 +-
hw/sparc/sun4m.c | 19 +-
hw/sparc64/sun4u.c | 10 +-
hw/vfio/listener.c | 2 +-
hw/virtio/virtio-mem.c | 35 +-
hw/xen/xen-hvm-common.c | 8 +-
hw/xen/xen-mapcache.c | 2 +-
hw/xen/xen_stubs.c | 6 +-
hw/xtensa/xtfpga.c | 4 +-
stubs/physmem.c | 2 +-
stubs/ram-block.c | 6 +-
system/memory.c | 322 ++++++------------
system/physmem.c | 30 +-
system/ram-block-attributes.c | 26 +-
23 files changed, 203 insertions(+), 481 deletions(-)