[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/7] docs/interop/live-block-operations: Do not hard-code the QEMU
From: |
Thomas Huth |
Subject: |
[PULL 1/7] docs/interop/live-block-operations: Do not hard-code the QEMU binary name |
Date: |
Mon, 21 Jun 2021 14:01:19 +0200 |
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 <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210607172311.915385-1-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
docs/interop/live-block-operations.rst | 32 +++++++++++++++-----------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/docs/interop/live-block-operations.rst
b/docs/interop/live-block-operations.rst
index 1073b930dc..477d085f54 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::
--
2.27.0
- [PULL 0/7] Documentation, qtest and misc patches, Thomas Huth, 2021/06/21
- [PULL 5/7] Remove leading underscores from QEMU defines, Thomas Huth, 2021/06/21
- [PULL 4/7] Update documentation to refer to new location for issues, Thomas Huth, 2021/06/21
- [PULL 3/7] docs/tools/virtiofsd: Fix bad rst syntax, Thomas Huth, 2021/06/21
- [PULL 2/7] docs/tools/virtiofsd.rst: Do not hard-code the QEMU binary name, Thomas Huth, 2021/06/21
- [PULL 6/7] fuzz: Display hexadecimal value with '0x' prefix, Thomas Huth, 2021/06/21
- [PULL 7/7] MAINTAINERS: Add qtest/arm-cpu-features.c to ARM TCG CPUs section, Thomas Huth, 2021/06/21
- [PULL 1/7] docs/interop/live-block-operations: Do not hard-code the QEMU binary name,
Thomas Huth <=
- Re: [PULL 0/7] Documentation, qtest and misc patches, Peter Maydell, 2021/06/24