[PATCH] KVM: Documentation: remove VM mmap documentation

[PATCH] KVM: Documentation: remove VM mmap documentation

[Jann Horn]

Since commit 80f5b5e700fa9c ("KVM: remove vm mmap method"), the VM mmap
handler is gone. Remove the corresponding documentation.

Signed-off-by: Jann Horn <jannh@google.com>
---
 Documentation/virtual/kvm/api.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
index fd106899afd1..e59af374aa86 100644
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
@@ -110,11 +110,7 @@ Type: system ioctl
 Parameters: machine type identifier (KVM_VM_*)
 Returns: a VM fd that can be used to control the new virtual machine.
 
-The new VM has no virtual cpus and no memory.  An mmap() of a VM fd
-will access the virtual machine's physical address space; offset zero
-corresponds to guest physical address zero.  Use of mmap() on a VM fd
-is discouraged if userspace memory allocation (KVM_CAP_USER_MEMORY) is
-available.
+The new VM has no virtual cpus and no memory.
 You most certainly want to use 0 as machine type.
 
 In order to create user controlled virtual machines on S390, check
-- 
2.12.2.816.g2cccc81164-goog

Re: [PATCH] KVM: Documentation: remove VM mmap documentation

[David Hildenbrand]

On 24.04.2017 11:16, Jann Horn wrote:
> as no virtual cpus and no memory.  An mmap() of a VM fd
> -will access the virtual machine's physical address space; offset zero
> -corresponds to guest physical address zero.  Use of mmap() on a VM fd
> -is discouraged if userspace memory allocation (KVM_CAP_USER_MEMORY) is
> -available.
> +The new VM has no virtual cpus and no memory.

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 

Thanks,

David

Re: [PATCH] KVM: Documentation: remove VM mmap documentation

[Jonathan Corbet]

On Mon, 24 Apr 2017 11:16:49 +0200
Jann Horn <jannh@google.com> wrote:

> Since commit 80f5b5e700fa9c ("KVM: remove vm mmap method"), the VM mmap
> handler is gone. Remove the corresponding documentation.

Applied to the docs tree, thanks.

jon

Re: [PATCH] KVM: Documentation: remove VM mmap documentation

[Jonathan Corbet]

On Thu, 27 Apr 2017 15:40:42 -0600
Jonathan Corbet <corbet@lwn.net> wrote:

> On Mon, 24 Apr 2017 11:16:49 +0200
> Jann Horn <jannh@google.com> wrote:
> 
> > Since commit 80f5b5e700fa9c ("KVM: remove vm mmap method"), the VM mmap
> > handler is gone. Remove the corresponding documentation.  
> 
> Applied to the docs tree, thanks.

Actually, I've unapplied it since it leads to conflicts with the kvm
tree, and poor Stephen has already had to fix up too many of those for me
this time around.  Paolo, maybe you'd like to pick it up and reconcile
things?

Thanks,

jon

Re: [PATCH] KVM: Documentation: remove VM mmap documentation

[Paolo Bonzini]

On 27/04/2017 23:57, Jonathan Corbet wrote:
> On Thu, 27 Apr 2017 15:40:42 -0600
> Jonathan Corbet <corbet@lwn.net> wrote:
> 
>> On Mon, 24 Apr 2017 11:16:49 +0200
>> Jann Horn <jannh@google.com> wrote:
>>
>>> Since commit 80f5b5e700fa9c ("KVM: remove vm mmap method"), the VM mmap
>>> handler is gone. Remove the corresponding documentation.  
>>
>> Applied to the docs tree, thanks.
> 
> Actually, I've unapplied it since it leads to conflicts with the kvm
> tree, and poor Stephen has already had to fix up too many of those for me
> this time around.  Paolo, maybe you'd like to pick it up and reconcile
> things?

Yes, I'll apply it for 4.12.

Paolo