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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20130405151252.23846e5ad5d6ec7faa49b50f@canb.auug.org.au>
Date:	Fri, 5 Apr 2013 15:12:52 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Michael S. Tsirkin" <mst@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Cornelia Huck <cornelia.huck@...ibm.com>,
	Marcelo Tosatti <mtosatti@...hat.com>,
	Gleb Natapov <gleb@...hat.com>
Subject: linux-next: manual merge of the vhost tree with the kvm tree

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@...b.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)
  

Content of type "application/pgp-signature" skipped