linux-next: manual merge of the vhost tree with the kvm tree

linux-next: manual merge of the vhost tree with the kvm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 749 bytes --]

Hi Michael,

Today's linux-next merge of the vhost tree got a conflict in
include/linux/kvm_host.h between commit 060f0ce6ff97 ("KVM: Introduce
KVM_VIRTIO_CCW_NOTIFY_BUS") from the kvm tree and commit 4697e2cddfe6
("kvm: add PV MMIO EVENTFD") from the vhost tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/kvm_host.h
index 0f4941a,35b74cd..0000000
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@@ -149,7 -149,7 +149,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
  };
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the vhost tree with the kvm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]

Hi Michael,

Today's linux-next merge of the vhost tree got a conflict in
include/uapi/linux/kvm.h between commit 2b83451b45d7 ("KVM: ioeventfd for
virtio-ccw devices") from the kvm tree and commit 4697e2cddfe6 ("kvm: add
PV MMIO EVENTFD") from the vhost tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/uapi/linux/kvm.h
index 74d0ff3,61783ee..0000000
--- a/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)
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]