Failed in applying to current master (
apply log)
Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Stefano Stabellini <sstabellini@kernel.org>, Anthony Perard <anthony.perard@citrix.com>, Paul Durrant <paul@xen.org>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, David Woodhouse <dwmw2@infradead.org>, Jason Wang <jasowang@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
MAINTAINERS | 2 +-
blockdev.c | 15 +-
docs/system/i386/xen.rst | 107 +++--
hw/block/xen-block.c | 118 ++++-
hw/char/trace-events | 8 +
hw/char/xen_console.c | 572 +++++++++++++++++++------
hw/i386/kvm/meson.build | 1 +
hw/i386/kvm/trace-events | 2 +
hw/i386/kvm/xen-stubs.c | 8 +
hw/i386/kvm/xen_evtchn.c | 151 +++----
hw/i386/kvm/xen_gnttab.c | 7 +-
hw/i386/kvm/xen_primary_console.c | 193 +++++++++
hw/i386/kvm/xen_primary_console.h | 23 +
hw/i386/kvm/xen_xenstore.c | 23 +-
hw/i386/pc.c | 11 +-
hw/i386/pc_piix.c | 2 +-
hw/i386/pc_q35.c | 2 +-
hw/i386/xen/xen_platform.c | 77 ++--
hw/net/meson.build | 2 +-
hw/net/trace-events | 11 +
hw/net/xen_nic.c | 484 ++++++++++++++++-----
hw/xen/xen-backend.c | 27 +-
hw/xen/xen-bus.c | 23 +-
hw/xen/xen-legacy-backend.c | 1 -
hw/xen/xen_devconfig.c | 28 --
hw/xenpv/xen_machine_pv.c | 10 -
include/hw/i386/pc.h | 4 +-
include/hw/xen/interface/arch-arm.h | 37 +-
include/hw/xen/interface/arch-x86/cpuid.h | 31 +-
include/hw/xen/interface/arch-x86/xen-x86_32.h | 19 +-
include/hw/xen/interface/arch-x86/xen-x86_64.h | 19 +-
include/hw/xen/interface/arch-x86/xen.h | 26 +-
include/hw/xen/interface/event_channel.h | 19 +-
include/hw/xen/interface/features.h | 19 +-
include/hw/xen/interface/grant_table.h | 19 +-
include/hw/xen/interface/hvm/hvm_op.h | 19 +-
include/hw/xen/interface/hvm/params.h | 19 +-
include/hw/xen/interface/io/blkif.h | 27 +-
include/hw/xen/interface/io/console.h | 19 +-
include/hw/xen/interface/io/fbif.h | 19 +-
include/hw/xen/interface/io/kbdif.h | 19 +-
include/hw/xen/interface/io/netif.h | 25 +-
include/hw/xen/interface/io/protocols.h | 19 +-
include/hw/xen/interface/io/ring.h | 49 +--
include/hw/xen/interface/io/usbif.h | 19 +-
include/hw/xen/interface/io/xenbus.h | 19 +-
include/hw/xen/interface/io/xs_wire.h | 36 +-
include/hw/xen/interface/memory.h | 30 +-
include/hw/xen/interface/physdev.h | 23 +-
include/hw/xen/interface/sched.h | 19 +-
include/hw/xen/interface/trace.h | 19 +-
include/hw/xen/interface/vcpu.h | 19 +-
include/hw/xen/interface/version.h | 19 +-
include/hw/xen/interface/xen-compat.h | 19 +-
include/hw/xen/interface/xen.h | 19 +-
include/hw/xen/xen-backend.h | 1 +
include/hw/xen/xen-bus.h | 5 +-
include/hw/xen/xen-legacy-backend.h | 1 -
qemu-options.hx | 12 +-
target/i386/kvm/kvm.c | 4 +
target/i386/kvm/xen-emu.c | 43 +-
61 files changed, 1640 insertions(+), 983 deletions(-)
create mode 100644 hw/i386/kvm/xen_primary_console.c
create mode 100644 hw/i386/kvm/xen_primary_console.h