Failed in applying to current master (
apply log)
Maintainers: Stefano Stabellini <sstabellini@kernel.org>, Anthony Perard <anthony.perard@citrix.com>, Paul Durrant <paul@xen.org>, Peter Maydell <peter.maydell@linaro.org>, Stefan Hajnoczi <stefanha@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Peter Xu <peterx@redhat.com>, David Hildenbrand <david@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, "Alex Bennée" <alex.bennee@linaro.org>, Cleber Rosa <crosa@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, David Woodhouse <dwmw2@infradead.org>
hw/block/xen_blkif.h | 8 +++-----
hw/xen/xen_pt.h | 24 ++++++++++--------------
include/hw/arm/xen_arch_hvm.h | 9 ---------
include/hw/i386/xen_arch_hvm.h | 11 -----------
include/hw/xen/arch_hvm.h | 5 -----
include/hw/xen/xen-hvm-common.h | 9 +++++++--
include/hw/xen/xen_igd.h | 33 +++++++++++++++++++++++++++++++++
include/sysemu/xen-mapcache.h | 3 ++-
include/sysemu/xen.h | 8 ++++----
accel/xen/xen-all.c | 1 +
hw/arm/xen_arm.c | 12 ++++++------
hw/display/vga.c | 5 ++++-
hw/i386/pc_piix.c | 1 +
hw/i386/xen/xen-hvm.c | 18 +++++++++---------
hw/pci/msi.c | 3 ++-
hw/xen/xen-hvm-common.c | 23 ++++++++++++-----------
hw/xen/xen_pt.c | 3 ++-
hw/xen/xen_pt_config_init.c | 3 ++-
hw/xen/xen_pt_graphics.c | 3 ++-
hw/xen/xen_pt_stub.c | 2 +-
stubs/xen-hw-stub.c | 28 ----------------------------
system/physmem.c | 2 +-
accel/xen/meson.build | 2 +-
hw/block/dataplane/meson.build | 2 +-
hw/i386/xen/meson.build | 4 +++-
hw/xen/meson.build | 21 ++++++++++-----------
tests/avocado/boot_xen.py | 3 +++
tests/avocado/kvm_xen_guest.py | 1 +
28 files changed, 121 insertions(+), 126 deletions(-)
delete mode 100644 include/hw/arm/xen_arch_hvm.h
delete mode 100644 include/hw/i386/xen_arch_hvm.h
delete mode 100644 include/hw/xen/arch_hvm.h
create mode 100644 include/hw/xen/xen_igd.h