Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
	include/linux/kvm_host.h
	include/uapi/linux/kvm.h
	virt/kvm/eventfd.c

diff --cc arch/x86/kvm/vmx.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc include/linux/kvm_host.h
index 77a1818bfafb75179941349992aceccbbfc05d4e,35b74cdaf4710b986098fea3e8375cd4a0c2fd99..7b87c2c48df106c25d980a06960341567e29764f
--- 1/include/linux/kvm_host.h
--- 2/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@@ -152,7 -149,7 +152,8 @@@ struct kvm_io_bus 
  enum kvm_bus {
        KVM_MMIO_BUS,
        KVM_PIO_BUS,
 +      KVM_VIRTIO_CCW_NOTIFY_BUS,
+       KVM_PV_MMIO_BUS,
        KVM_NR_BUSES
  };
  

diff --cc include/uapi/linux/kvm.h
index 74d0ff3dfd666b073bc1698e05e646ed0b4a9fed,61783ee327177b336d75426dfbdd728bc9e11315..67c65f0de812101e8938101e2b7ac020f496d9c9
--- 1/include/uapi/linux/kvm.h
--- 2/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -449,15 -449,20 +449,23 @@@ enum 
        kvm_ioeventfd_flag_nr_datamatch,
        kvm_ioeventfd_flag_nr_pio,
        kvm_ioeventfd_flag_nr_deassign,
 +      kvm_ioeventfd_flag_nr_virtio_ccw_notify,
+       kvm_ioeventfd_flag_nr_pv_mmio,
        kvm_ioeventfd_flag_nr_max,
  };
  
  #define KVM_IOEVENTFD_FLAG_DATAMATCH (1 << kvm_ioeventfd_flag_nr_datamatch)
  #define KVM_IOEVENTFD_FLAG_PIO       (1 << kvm_ioeventfd_flag_nr_pio)
+ /*
+  * PV_MMIO - Guest can promise us that all accesses touching this address
+  * are writes of specified length, starting at the specified address.
+  * If not - it's a Guest bug.
+  * Can not be used together with either PIO or DATAMATCH.
+  */
+ #define KVM_IOEVENTFD_FLAG_PV_MMIO   (1 << kvm_ioeventfd_flag_nr_pv_mmio)
  #define KVM_IOEVENTFD_FLAG_DEASSIGN  (1 << kvm_ioeventfd_flag_nr_deassign)
 +#define KVM_IOEVENTFD_FLAG_VIRTIO_CCW_NOTIFY \
 +      (1 << kvm_ioeventfd_flag_nr_virtio_ccw_notify)
  
  #define KVM_IOEVENTFD_VALID_FLAG_MASK  ((1 << kvm_ioeventfd_flag_nr_max) - 1)
  

diff --cc virt/kvm/eventfd.c
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge