[PULL 0/1] Docs update for 2026-06-26

[PULL 0/1] Docs update for 2026-06-26

[Pierrick Bouvier]

The following changes since commit 8f1d3b586f1265023f75ea9c227c35d463321aef:

  Merge tag 'pbouvier/pr/ci-20260625' of https://gitlab.com/p-b-o/qemu into staging (2026-06-26 07:58:03 -0400)

are available in the Git repository at:

  https://gitlab.com/p-b-o/qemu tags/pbouvier/pr/docs-20260626

for you to fetch changes up to ee03a20aabd2783a575035bd9dcbd46883647d0f:

  docs/system: add general note about architecture and machine differences (2026-06-26 12:10:41 -0700)

----------------------------------------------------------------
Changes:
- [PATCH v3] docs/system: add general note about architecture and (Linisha <linisha232@gmail.com>)
  Link: https://lore.kernel.org/qemu-devel/20260626181118.1136-1-linisha232@gmail.com

----------------------------------------------------------------
Linisha (1):
      docs/system: add general note about architecture and machine differences

 docs/system/introduction.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

[PULL 1/1] docs/system: add general note about architecture and machine differences

[Pierrick Bouvier]

From: Linisha <linisha232@gmail.com>

Add a note near the start of the introduction explaining that QEMU
options, properties, and command lines may differ between target
architectures and machine types. This helps prevent confusion when
examples shown for one architecture do not work for another, such as
the pflash0/pflash1 options visible in -machine help on some machines
but not others.

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Buglink: https://gitlab.com/qemu-project/qemu/-/issues/3254
Signed-off-by: Linisha <linisha232@gmail.com>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Link: https://lore.kernel.org/qemu-devel/20260626181118.1136-1-linisha232@gmail.com
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
---
 docs/system/introduction.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/system/introduction.rst b/docs/system/introduction.rst
index bec7291e476..8d9ef61d262 100644
--- a/docs/system/introduction.rst
+++ b/docs/system/introduction.rst
@@ -1,6 +1,15 @@
 Introduction
 ============
 
+.. note::
+   QEMU supports many different target CPU architectures and many
+   different machine types for each architecture. Options, properties,
+   and command lines that work for one architecture or machine type
+   will not necessarily work on another. The examples shown in this
+   manual are specific to the architecture and machine type being
+   demonstrated. When in doubt, consult the documentation for your
+   specific target architecture and machine type.
+
 .. _Accelerators:
 
 Virtualisation Accelerators
-- 
2.47.3

Re: [PULL 0/1] Docs update for 2026-06-26

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 116 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/11.1 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]