On 9/19/25 11:07, Daniel P. Berrangé wrote:
On Fri, Sep 19, 2025 at 10:36:21AM +0200, Paolo Bonzini wrote:
The version in the system might be too old for QEMU; this will be
especially true if Rust is going to be enabled by default.
Adjust the docs to suggest using pyvenv/bin/meson.
I presume this is essentially changing the docs to match
what our "make" wrappers will be running internally ?
Yes, they use $(MESON) which is /home/user/qemu/build/pyvenv/bin/meson
or something like that. I made a mental note about this last week,
since you and Thomas mentioned it.
Paolo
Signed-off-by: Paolo Bonzini <[email protected]>
---
docs/devel/build-system.rst | 2 +-
docs/devel/rust.rst | 2 +-
docs/system/devices/igb.rst | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Reviewed-by: Daniel P. Berrangé <[email protected]>
diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst
index 2c884197a20..6204aa6a72e 100644
--- a/docs/devel/build-system.rst
+++ b/docs/devel/build-system.rst
@@ -450,7 +450,7 @@ are run with ``make bench``. Meson test suites such as
``unit`` can be ran
with ``make check-unit``, and ``make check-tcg`` builds and runs "non-Meson"
tests for all targets.
-If desired, it is also possible to use ``ninja`` and ``meson test``,
+If desired, it is also possible to use ``ninja`` and ``pyvenv/bin/meson test``,
respectively to build emulators and run tests defined in meson.build.
The main difference is that ``make`` needs the ``-jN`` flag in order to
enable parallel builds or tests.
diff --git a/docs/devel/rust.rst b/docs/devel/rust.rst
index 13a20e86a16..2f0ab2e2821 100644
--- a/docs/devel/rust.rst
+++ b/docs/devel/rust.rst
@@ -66,7 +66,7 @@ __ https://mesonbuild.com/Commands.html#devenv
As shown above, you can use the ``--tests`` option as usual to operate on test
code. Note however that you cannot *build* or run tests via ``cargo``,
because
they need support C code from QEMU that Cargo does not know about. Tests can
-be run via ``meson test`` or ``make``::
+be run via Meson (``pyvenv/bin/meson test``) or ``make``::
make check-rust
diff --git a/docs/system/devices/igb.rst b/docs/system/devices/igb.rst
index 71f31cb1160..50f625fd77e 100644
--- a/docs/system/devices/igb.rst
+++ b/docs/system/devices/igb.rst
@@ -54,7 +54,7 @@ directory:
.. code-block:: shell
- meson test qtest-x86_64/qos-test
+ pyvenv/bin/meson test qtest-x86_64/qos-test
ethtool can test register accesses, interrupts, etc. It is automated as an
functional test and can be run from the build directory with the following
--
2.51.0
With regards,
Daniel
