motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 17:53:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

docs/vhost-user: Fix mismerge

Browse source 
This reverts commit 76b1b64370.

The commit only duplicated some text that had already been merged in
commit 31009d13cc.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20220627134500.94842-2-kwolf@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Kevin Wolf 2022-06-27 15:44:58 +02:00 • committed by Michael S. Tsirkin
parent d355566bd9
commit ea06220600
1 changed files with 0 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
docs/interop/vhost-user.rst
View file

@ -1376,14 +1376,6 @@ Front-end message types
For further details on postcopy, see ``VHOST_USER_SET_MEM_TABLE``. For further details on postcopy, see ``VHOST_USER_SET_MEM_TABLE``.
They apply to ``VHOST_USER_ADD_MEM_REG`` accordingly. They apply to ``VHOST_USER_ADD_MEM_REG`` accordingly.
Exactly one file descriptor from which the memory is mapped is
passed in the ancillary data.
In postcopy mode (see ``VHOST_USER_POSTCOPY_LISTEN``), the back-end
replies with the bases of the memory mapped region to the front-end.
For further details on postcopy, see ``VHOST_USER_SET_MEM_TABLE``.
They apply to ``VHOST_USER_ADD_MEM_REG`` accordingly.
``VHOST_USER_REM_MEM_REG`` ``VHOST_USER_REM_MEM_REG``
:id: 38 :id: 38
:equivalent ioctl: N/A :equivalent ioctl: N/A
@ -1408,14 +1400,6 @@ Front-end message types
accept messages with one file descriptor. If a file descriptor is accept messages with one file descriptor. If a file descriptor is
passed, the back-end MUST close it without using it otherwise. passed, the back-end MUST close it without using it otherwise.
The memory region to be removed is identified by its guest address,
user address and size. The mmap offset is ignored.
No file descriptors SHOULD be passed in the ancillary data. For
compatibility with existing incorrect implementations, the back-end MAY
accept messages with one file descriptor. If a file descriptor is
passed, the back-end MUST close it without using it otherwise.
``VHOST_USER_SET_STATUS`` ``VHOST_USER_SET_STATUS``
:id: 39 :id: 39
:equivalent ioctl: VHOST_VDPA_SET_STATUS :equivalent ioctl: VHOST_VDPA_SET_STATUS