diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2022-06-27 15:44:58 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2022-06-27 18:53:18 -0400 |
| commit | ea0622060073b7bedda4a54312eeb6189983d1e3 (patch) | |
| tree | 5b628cc1eac07bcd6a997a3f9e7ac38e900207b4 | |
| parent | d355566bd958e24e7e384da6ea89a9fc88d7bfed (diff) | |
| download | qemu-ea0622060073b7bedda4a54312eeb6189983d1e3.zip qemu-ea0622060073b7bedda4a54312eeb6189983d1e3.tar.gz qemu-ea0622060073b7bedda4a54312eeb6189983d1e3.tar.bz2 | |
docs/vhost-user: Fix mismerge
This reverts commit 76b1b64370007234279ea4cc8b09c98cbd2523de.
The commit only duplicated some text that had already been merged in
commit 31009d13cc5.
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>
| -rw-r--r-- | docs/interop/vhost-user.rst | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/docs/interop/vhost-user.rst b/docs/interop/vhost-user.rst index d7cf904..3f18ab4 100644 --- a/docs/interop/vhost-user.rst +++ b/docs/interop/vhost-user.rst @@ -1376,14 +1376,6 @@ Front-end message types For further details on postcopy, see ``VHOST_USER_SET_MEM_TABLE``. 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`` :id: 38 :equivalent ioctl: N/A @@ -1408,14 +1400,6 @@ Front-end message types accept messages with one file descriptor. If a file descriptor is 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`` :id: 39 :equivalent ioctl: VHOST_VDPA_SET_STATUS |