Merge tag 'pull-riscv-to-apply-20250407-1' of https://github.com/alistair23/qemu into staging

Sixth RISC-V PR for 10.0

* Deprecate the default RISC-V machine

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEaukCtqfKh31tZZKWr3yVEwxTgBMFAmfzXpQACgkQr3yVEwxT
# gBOmaA//cJ9ENSmSfCOagp0yc54YsV12WFZO6g+oGggkur2PhxDSHQk3TspkUed2
# oWMD6U2t0PoYk8mXhNHvYXVFC4HygA5kan1pWVg/1XbrmZPPdYbe1wwXbUjwAy91
# 5fNNqNQtEge4Von8fSbgK7Pc1bDIe1W296muKgfiO8ZQVRmbKQLfSEvdedAzsaPf
# +C/VG0V4thYa8mXyZlLryw2SKpn03wUtrhInHmqkDPjip7J/X7/Bb0lWOSlGGDSG
# ODpvCDDznbPNV21Hwjtbf9EauiorIJVBsnBv/vde5t6ZaRuRpn3ZDfxozPi1yO0o
# uOcypd7v4kZpaJDWxmEUTRvbQls8AOUDoKsBKEbRjQScRyQpwdjynonVDYykVHq3
# 4ByWKDqejxk39g5cvzNMvRqma4MTJnbfmxrwopw1XYVhjDD7jFCq+8duO5+WPyRI
# bTS0qh6B/t4d3loma75InVry2TfycbmP/2rw2yazh8wsg3KQ5LNKb/K+SPgekzQu
# oGxxd0zYClMMS1qumtiZRgAn5F8Ub5ld1xnfANmZtj+QwqjqnwyEMj2ergTBZsJP
# 0rlJWmzl//Mpb5aguMUSyM18Ra/q0j08TjMq3f4Nkcrflk4FGoaN2lguYsFqN3Lc
# VnT8woFGWd2Wl+FUt2aKwCWTW4OsdImxsNY9g1cp7KqNHMs9Z9k=
# =XfZF
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 07 Apr 2025 01:11:48 EDT
# gpg:                using RSA key 6AE902B6A7CA877D6D659296AF7C95130C538013
# gpg: Good signature from "Alistair Francis <alistair@alistair23.me>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6AE9 02B6 A7CA 877D 6D65  9296 AF7C 9513 0C53 8013

* tag 'pull-riscv-to-apply-20250407-1' of https://github.com/alistair23/qemu:
  docs: deprecate RISC-V default machine option

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

1 files changed, 17 insertions, 0 deletions

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 76291fdfd6..0f41a99c67 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -304,6 +304,23 @@ online to check that this board did not completely bitrot yet). It is
 recommended to use another MIPS machine for future MIPS code development
 instead.
 
+RISC-V default machine option (since 10.0)
+''''''''''''''''''''''''''''''''''''''''''
+
+RISC-V defines ``spike`` as the default machine if no machine option is
+given in the command line.  This happens because ``spike`` is the first
+RISC-V machine implemented in QEMU and setting it as default was
+convenient at that time.  Now we have 7 riscv64 and 6 riscv32 machines
+and having ``spike`` as a default is no longer justified.  This default
+will also promote situations where users think they're running ``virt``
+(the most used RISC-V machine type in 10.0) when in fact they're
+running ``spike``.
+
+Removing the default machine option forces users to always set the machine
+they want to use and avoids confusion.  Existing users of the ``spike``
+machine must ensure that they're setting the ``spike`` machine in the
+command line (``-M spike``).
+
 
 Backend options
 ---------------