From 2c1730f780b2baf37acd7c466d6111061370d117 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 7 Jun 2021 19:23:11 +0200 Subject: docs/interop/live-block-operations: Do not hard-code the QEMU binary name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In downstream, we want to use a different name for the QEMU binary, and some people might also use the docs for non-x86 binaries, that's why we already created the |qemu_system| placeholder in the past. Use it now in the live-block-operations doc, too. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210607172311.915385-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- docs/interop/live-block-operations.rst | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'docs') diff --git a/docs/interop/live-block-operations.rst b/docs/interop/live-block-operations.rst index 1073b93..477d085 100644 --- a/docs/interop/live-block-operations.rst +++ b/docs/interop/live-block-operations.rst @@ -127,13 +127,15 @@ Interacting with a QEMU instance To show some example invocations of command-line, we will use the following invocation of QEMU, with a QMP server running over UNIX -socket:: +socket: - $ ./qemu-system-x86_64 -display none -no-user-config \ - -M q35 -nodefaults -m 512 \ - -blockdev node-name=node-A,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./a.qcow2 \ - -device virtio-blk,drive=node-A,id=virtio0 \ - -monitor stdio -qmp unix:/tmp/qmp-sock,server=on,wait=off +.. parsed-literal:: + + $ |qemu_system| -display none -no-user-config -nodefaults \\ + -m 512 -blockdev \\ + node-name=node-A,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./a.qcow2 \\ + -device virtio-blk,drive=node-A,id=virtio0 \\ + -monitor stdio -qmp unix:/tmp/qmp-sock,server=on,wait=off The ``-blockdev`` command-line option, used above, is available from QEMU 2.9 onwards. In the above invocation, notice the ``node-name`` @@ -692,14 +694,16 @@ And start the destination QEMU (we already have the source QEMU running -- discussed in the section: `Interacting with a QEMU instance`_) instance, with the following invocation. (As noted earlier, for simplicity's sake, the destination QEMU is started on the same host, but -it could be located elsewhere):: - - $ ./qemu-system-x86_64 -display none -no-user-config \ - -M q35 -nodefaults -m 512 \ - -blockdev node-name=node-TargetDisk,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./target-disk.qcow2 \ - -device virtio-blk,drive=node-TargetDisk,id=virtio0 \ - -S -monitor stdio -qmp unix:./qmp-sock2,server=on,wait=off \ - -incoming tcp:localhost:6666 +it could be located elsewhere): + +.. parsed-literal:: + + $ |qemu_system| -display none -no-user-config -nodefaults \\ + -m 512 -blockdev \\ + node-name=node-TargetDisk,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./target-disk.qcow2 \\ + -device virtio-blk,drive=node-TargetDisk,id=virtio0 \\ + -S -monitor stdio -qmp unix:./qmp-sock2,server=on,wait=off \\ + -incoming tcp:localhost:6666 Given the disk image chain on source QEMU:: -- cgit v1.1 From 771f3be1b5d6c540c427bc7274ab36e2cccba694 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 7 Jun 2021 19:42:50 +0200 Subject: docs/tools/virtiofsd.rst: Do not hard-code the QEMU binary name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In downstream, we want to use a different name for the QEMU binary, and some people might also use the docs for non-x86 binaries, that's why we already created the |qemu_system| placeholder in the past. Use it now in the virtiofsd doc, too. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Hajnoczi Reviewed-by: Dr. David Alan Gilbert Message-Id: <20210607174250.920226-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- docs/tools/virtiofsd.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'docs') diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst index 00554c7..265a39b 100644 --- a/docs/tools/virtiofsd.rst +++ b/docs/tools/virtiofsd.rst @@ -298,13 +298,13 @@ Examples Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain socket ``/var/run/vm001-vhost-fs.sock``: -:: +.. parsed-literal:: host# virtiofsd --socket-path=/var/run/vm001-vhost-fs.sock -o source=/var/lib/fs/vm001 - host# qemu-system-x86_64 \ - -chardev socket,id=char0,path=/var/run/vm001-vhost-fs.sock \ - -device vhost-user-fs-pci,chardev=char0,tag=myfs \ - -object memory-backend-memfd,id=mem,size=4G,share=on \ - -numa node,memdev=mem \ - ... + host# |qemu_system| \\ + -chardev socket,id=char0,path=/var/run/vm001-vhost-fs.sock \\ + -device vhost-user-fs-pci,chardev=char0,tag=myfs \\ + -object memory-backend-memfd,id=mem,size=4G,share=on \\ + -numa node,memdev=mem \\ + ... guest# mount -t virtiofs myfs /mnt -- cgit v1.1 From af94f14046e29e667edb6f802a108162b4890972 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 7 Jun 2021 20:00:15 +0200 Subject: docs/tools/virtiofsd: Fix bad rst syntax For literal blocks, there has to be an empty line after the two colons, and the block itself should be indented. Signed-off-by: Thomas Huth Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Stefan Hajnoczi Message-Id: <20210607180015.924571-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- docs/tools/virtiofsd.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst index 265a39b..4911e79 100644 --- a/docs/tools/virtiofsd.rst +++ b/docs/tools/virtiofsd.rst @@ -239,7 +239,7 @@ xattr-mapping Examples :: --o xattrmap=":prefix:all::user.virtiofs.::bad:all:::" + -o xattrmap=":prefix:all::user.virtiofs.::bad:all:::" This uses two rules, using : as the field separator; @@ -250,7 +250,8 @@ the host set. This is equivalent to the 'map' rule: :: --o xattrmap=":map::user.virtiofs.:" + + -o xattrmap=":map::user.virtiofs.:" 2) Prefix 'trusted.' attributes, allow others through @@ -277,7 +278,8 @@ through. This is equivalent to the 'map' rule: :: --o xattrmap="/map/trusted./user.virtiofs./" + + -o xattrmap="/map/trusted./user.virtiofs./" 3) Hide 'security.' attributes, and allow everything else -- cgit v1.1