diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-03 17:04:25 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-21 06:30:40 -0400 |
| commit | 64ed6f92ffebb419ba71ef61e7bdb5f165c5043a (patch) | |
| tree | 1b7a2d3f7448e8e5c54c03d5a258cc3759dfe12d /docs/devel | |
| parent | f556b4a10d3ccd6cad01f704e4ccb2252520d61e (diff) | |
| download | qemu-64ed6f92ffebb419ba71ef61e7bdb5f165c5043a.zip qemu-64ed6f92ffebb419ba71ef61e7bdb5f165c5043a.tar.gz qemu-64ed6f92ffebb419ba71ef61e7bdb5f165c5043a.tar.bz2 | |
meson: link emulators without Makefile.target
The binaries move to the root directory, e.g. qemu-system-i386 or
qemu-arm. This requires changes to qtests, CI, etc.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'docs/devel')
| -rw-r--r-- | docs/devel/blkverify.txt | 4 | ||||
| -rw-r--r-- | docs/devel/testing.rst | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/devel/blkverify.txt b/docs/devel/blkverify.txt index d556dc4..aca826c 100644 --- a/docs/devel/blkverify.txt +++ b/docs/devel/blkverify.txt @@ -62,8 +62,8 @@ A more realistic scenario is verifying the installation of a guest OS: $ ./qemu-img create raw.img 16G $ ./qemu-img create -f qcow2 test.qcow2 16G - $ x86_64-softmmu/qemu-system-x86_64 -cdrom debian.iso \ - -drive file=blkverify:raw.img:test.qcow2 + $ ./qemu-system-x86_64 -cdrom debian.iso \ + -drive file=blkverify:raw.img:test.qcow2 If the installation is aborted when blkverify detects corruption, use qemu-io to explore the contents of the disk image at the sector in question. diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index a426469..196e3bc 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -819,7 +819,7 @@ the following approaches: 1) Set ``qemu_bin``, and use the given binary 2) Do not set ``qemu_bin``, and use a QEMU binary named like - "${arch}-softmmu/qemu-system-${arch}", either in the current + "qemu-system-${arch}", either in the current working directory, or in the current source tree. The resulting ``qemu_bin`` value will be preserved in the @@ -886,7 +886,7 @@ like the following: .. code:: - PARAMS (key=qemu_bin, path=*, default=x86_64-softmmu/qemu-system-x86_64) => 'x86_64-softmmu/qemu-system-x86_64 + PARAMS (key=qemu_bin, path=*, default=./qemu-system-x86_64) => './qemu-system-x86_64 arch ~~~~ |