[PATCH 0/2] target/riscv: Update deprecated machines

[PATCH 0/2] target/riscv: Update deprecated machines

[alistair23]

From: Alistair Francis <alistair.francis@wdc.com>

This series removes spike as the default machine following a long
depreation timeline.

We also deprecate the now unmaintained shakti_c machine.

Alistair Francis (2):
  target/riscv: Remove spike as default machine
  target/riscv: Deprecate the shakti_c machine

 docs/about/deprecated.rst | 19 ++++---------------
 hw/riscv/shakti_c.c       |  1 +
 hw/riscv/spike.c          |  1 -
 3 files changed, 5 insertions(+), 16 deletions(-)

-- 
2.53.0

[PATCH 1/2] target/riscv: Remove spike as default machine

[alistair23]

From: Alistair Francis <alistair.francis@wdc.com>

In QEMU 10.0 we deprecated the default spike machine, let's finally
remove spike as the default and require users to specify the machine.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
 docs/about/deprecated.rst | 19 -------------------
 hw/riscv/spike.c          |  1 -
 2 files changed, 20 deletions(-)

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 10de10dc23..f3622dcf93 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -282,25 +282,6 @@ firmware is available to boot it. It can be replaced by the
 ``ast2700fc``, another multi-SoC machine based on the newer AST2700
 SoCs which are excepted to receive better support in the future.
 
-
-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
 ---------------
 
diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
index 35c696f891..87fe0f242f 100644
--- a/hw/riscv/spike.c
+++ b/hw/riscv/spike.c
@@ -341,7 +341,6 @@ static void spike_machine_class_init(ObjectClass *oc, const void *data)
     mc->desc = "RISC-V Spike board";
     mc->init = spike_board_init;
     mc->max_cpus = SPIKE_CPUS_MAX;
-    mc->is_default = true;
     mc->default_cpu_type = TYPE_RISCV_CPU_BASE;
     mc->possible_cpu_arch_ids = riscv_numa_possible_cpu_arch_ids;
     mc->cpu_index_to_instance_props = riscv_numa_cpu_index_to_props;
-- 
2.53.0

[PATCH 2/2] target/riscv: Deprecate the shakti_c machine

[alistair23]

From: Alistair Francis <alistair.francis@wdc.com>

The RISC-V shakti_c machine hasn't had meaningful contributions since 2021
and is currently unmaintained. The machine is scheduled to be removed as it
appears to have no users.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
 docs/about/deprecated.rst | 8 ++++++++
 hw/riscv/shakti_c.c       | 1 +
 2 files changed, 9 insertions(+)

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index f3622dcf93..041f71c5bf 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -282,6 +282,14 @@ firmware is available to boot it. It can be replaced by the
 ``ast2700fc``, another multi-SoC machine based on the newer AST2700
 SoCs which are excepted to receive better support in the future.
 
+
+RISC-V Shakti machine (since 11.1)
+''''''''''''''''''''''''''''''''''''''''''
+
+The RISC-V ``shakti_c`` machine hasn't had meaningful contributions since 2021
+and is currently unmaintained. The machine is scheduled to be removed as it
+appears to have no users.
+
 Backend options
 ---------------
 
diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c
index 49a39b3021..852d5b9797 100644
--- a/hw/riscv/shakti_c.c
+++ b/hw/riscv/shakti_c.c
@@ -83,6 +83,7 @@ static void shakti_c_machine_class_init(ObjectClass *klass, const void *data)
     mc->init = shakti_c_machine_state_init;
     mc->default_cpu_type = TYPE_RISCV_CPU_SHAKTI_C;
     mc->valid_cpu_types = valid_cpu_types;
+    mc->deprecation_reason = "Currently unmaintained with no known users";
     mc->default_ram_id = "riscv.shakti.c.ram";
 }
 
-- 
2.53.0

Re: [PATCH 1/2] target/riscv: Remove spike as default machine

[Philippe Mathieu-Daudé]

On 30/4/26 07:22, alistair23@gmail.com wrote:
> From: Alistair Francis <alistair.francis@wdc.com>
> 
> In QEMU 10.0 we deprecated the default spike machine, let's finally
> remove spike as the default and require users to specify the machine.
> 
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> ---
>   docs/about/deprecated.rst | 19 -------------------
>   hw/riscv/spike.c          |  1 -
>   2 files changed, 20 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH 2/2] target/riscv: Deprecate the shakti_c machine

[Philippe Mathieu-Daudé]

On 30/4/26 07:22, alistair23@gmail.com wrote:
> From: Alistair Francis <alistair.francis@wdc.com>
> 
> The RISC-V shakti_c machine hasn't had meaningful contributions since 2021
> and is currently unmaintained. The machine is scheduled to be removed as it
> appears to have no users.
> 
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> ---
>   docs/about/deprecated.rst | 8 ++++++++
>   hw/riscv/shakti_c.c       | 1 +
>   2 files changed, 9 insertions(+)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH 2/2] target/riscv: Deprecate the shakti_c machine

[Richard Henderson]

On 4/30/26 15:22, alistair23@gmail.com wrote:
> From: Alistair Francis <alistair.francis@wdc.com>
> 
> The RISC-V shakti_c machine hasn't had meaningful contributions since 2021
> and is currently unmaintained. The machine is scheduled to be removed as it
> appears to have no users.
> 
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> ---
>   docs/about/deprecated.rst | 8 ++++++++
>   hw/riscv/shakti_c.c       | 1 +
>   2 files changed, 9 insertions(+)
> 
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index f3622dcf93..041f71c5bf 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -282,6 +282,14 @@ firmware is available to boot it. It can be replaced by the
>   ``ast2700fc``, another multi-SoC machine based on the newer AST2700
>   SoCs which are excepted to receive better support in the future.
>   
> +
> +RISC-V Shakti machine (since 11.1)
> +''''''''''''''''''''''''''''''''''''''''''

' does not match preceding line.

Otherwise,
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH 1/2] target/riscv: Remove spike as default machine

[Daniel Henrique Barboza]

On 4/30/2026 2:22 AM, alistair23@gmail.com wrote:
> From: Alistair Francis <alistair.francis@wdc.com>
> 
> In QEMU 10.0 we deprecated the default spike machine, let's finally
> remove spike as the default and require users to specify the machine.
> 
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> ---

Reviewed-by: Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com>


>   docs/about/deprecated.rst | 19 -------------------
>   hw/riscv/spike.c          |  1 -
>   2 files changed, 20 deletions(-)
> 
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index 10de10dc23..f3622dcf93 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -282,25 +282,6 @@ firmware is available to boot it. It can be replaced by the
>   ``ast2700fc``, another multi-SoC machine based on the newer AST2700
>   SoCs which are excepted to receive better support in the future.
>   
> -
> -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
>   ---------------
>   
> diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
> index 35c696f891..87fe0f242f 100644
> --- a/hw/riscv/spike.c
> +++ b/hw/riscv/spike.c
> @@ -341,7 +341,6 @@ static void spike_machine_class_init(ObjectClass *oc, const void *data)
>       mc->desc = "RISC-V Spike board";
>       mc->init = spike_board_init;
>       mc->max_cpus = SPIKE_CPUS_MAX;
> -    mc->is_default = true;
>       mc->default_cpu_type = TYPE_RISCV_CPU_BASE;
>       mc->possible_cpu_arch_ids = riscv_numa_possible_cpu_arch_ids;
>       mc->cpu_index_to_instance_props = riscv_numa_cpu_index_to_props;

Re: [PATCH 2/2] target/riscv: Deprecate the shakti_c machine

[Daniel Henrique Barboza]

On 4/30/2026 2:22 AM, alistair23@gmail.com wrote:
> From: Alistair Francis <alistair.francis@wdc.com>
> 
> The RISC-V shakti_c machine hasn't had meaningful contributions since 2021
> and is currently unmaintained. The machine is scheduled to be removed as it
> appears to have no users.
> 
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> ---

Reviewed-by: Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com>


>   docs/about/deprecated.rst | 8 ++++++++
>   hw/riscv/shakti_c.c       | 1 +
>   2 files changed, 9 insertions(+)
> 
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index f3622dcf93..041f71c5bf 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -282,6 +282,14 @@ firmware is available to boot it. It can be replaced by the
>   ``ast2700fc``, another multi-SoC machine based on the newer AST2700
>   SoCs which are excepted to receive better support in the future.
>   
> +
> +RISC-V Shakti machine (since 11.1)
> +''''''''''''''''''''''''''''''''''''''''''
> +
> +The RISC-V ``shakti_c`` machine hasn't had meaningful contributions since 2021
> +and is currently unmaintained. The machine is scheduled to be removed as it
> +appears to have no users.
> +
>   Backend options
>   ---------------
>   
> diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c
> index 49a39b3021..852d5b9797 100644
> --- a/hw/riscv/shakti_c.c
> +++ b/hw/riscv/shakti_c.c
> @@ -83,6 +83,7 @@ static void shakti_c_machine_class_init(ObjectClass *klass, const void *data)
>       mc->init = shakti_c_machine_state_init;
>       mc->default_cpu_type = TYPE_RISCV_CPU_SHAKTI_C;
>       mc->valid_cpu_types = valid_cpu_types;
> +    mc->deprecation_reason = "Currently unmaintained with no known users";
>       mc->default_ram_id = "riscv.shakti.c.ram";
>   }
>   

Re: [PATCH 1/2] target/riscv: Remove spike as default machine

[Chao Liu]

On Thu, Apr 30, 2026 at 03:22:17PM +1000, alistair23@gmail.com wrote:
> From: Alistair Francis <alistair.francis@wdc.com>
> 
> In QEMU 10.0 we deprecated the default spike machine, let's finally
> remove spike as the default and require users to specify the machine.
> 
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Chao Liu <chao.liu.zevorn@gmail.com>

> ---
>  docs/about/deprecated.rst | 19 -------------------
>  hw/riscv/spike.c          |  1 -
>  2 files changed, 20 deletions(-)
> 
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index 10de10dc23..f3622dcf93 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -282,25 +282,6 @@ firmware is available to boot it. It can be replaced by the
>  ``ast2700fc``, another multi-SoC machine based on the newer AST2700
>  SoCs which are excepted to receive better support in the future.
>  
> -
> -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
>  ---------------
>  
> diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
> index 35c696f891..87fe0f242f 100644
> --- a/hw/riscv/spike.c
> +++ b/hw/riscv/spike.c
> @@ -341,7 +341,6 @@ static void spike_machine_class_init(ObjectClass *oc, const void *data)
>      mc->desc = "RISC-V Spike board";
>      mc->init = spike_board_init;
>      mc->max_cpus = SPIKE_CPUS_MAX;
> -    mc->is_default = true;
>      mc->default_cpu_type = TYPE_RISCV_CPU_BASE;
>      mc->possible_cpu_arch_ids = riscv_numa_possible_cpu_arch_ids;
>      mc->cpu_index_to_instance_props = riscv_numa_cpu_index_to_props;
> -- 
> 2.53.0
> 

Re: [PATCH 2/2] target/riscv: Deprecate the shakti_c machine

[Chao Liu]

On Thu, Apr 30, 2026 at 03:22:18PM +1000, alistair23@gmail.com wrote:
> From: Alistair Francis <alistair.francis@wdc.com>
> 
> The RISC-V shakti_c machine hasn't had meaningful contributions since 2021
> and is currently unmaintained. The machine is scheduled to be removed as it
> appears to have no users.
> 
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Chao Liu <chao.liu.zevorn@gmail.com>

> ---
>  docs/about/deprecated.rst | 8 ++++++++
>  hw/riscv/shakti_c.c       | 1 +
>  2 files changed, 9 insertions(+)
> 
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index f3622dcf93..041f71c5bf 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -282,6 +282,14 @@ firmware is available to boot it. It can be replaced by the
>  ``ast2700fc``, another multi-SoC machine based on the newer AST2700
>  SoCs which are excepted to receive better support in the future.
>  
> +
> +RISC-V Shakti machine (since 11.1)
> +''''''''''''''''''''''''''''''''''''''''''
> +
> +The RISC-V ``shakti_c`` machine hasn't had meaningful contributions since 2021
> +and is currently unmaintained. The machine is scheduled to be removed as it
> +appears to have no users.
> +
>  Backend options
>  ---------------
>  
> diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c
> index 49a39b3021..852d5b9797 100644
> --- a/hw/riscv/shakti_c.c
> +++ b/hw/riscv/shakti_c.c
> @@ -83,6 +83,7 @@ static void shakti_c_machine_class_init(ObjectClass *klass, const void *data)
>      mc->init = shakti_c_machine_state_init;
>      mc->default_cpu_type = TYPE_RISCV_CPU_SHAKTI_C;
>      mc->valid_cpu_types = valid_cpu_types;
> +    mc->deprecation_reason = "Currently unmaintained with no known users";
>      mc->default_ram_id = "riscv.shakti.c.ram";
>  }
>  
> -- 
> 2.53.0
> 

Re: [PATCH 1/2] target/riscv: Remove spike as default machine

[Peter Maydell]

On Thu, 30 Apr 2026 at 06:23, <alistair23@gmail.com> wrote:
>
> From: Alistair Francis <alistair.francis@wdc.com>
>
> In QEMU 10.0 we deprecated the default spike machine, let's finally
> remove spike as the default and require users to specify the machine.
>
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> ---
>  docs/about/deprecated.rst | 19 -------------------
>  hw/riscv/spike.c          |  1 -
>  2 files changed, 20 deletions(-)

Generally when we move something from "deprecated" to
"dropped" we add an entry to removed-features.rst
(often more or less the same text that we take out of
deprecated.rst).

-- PMM

Re: [PATCH 1/2] target/riscv: Remove spike as default machine

[Alistair Francis]

On Fri, May 1, 2026 at 11:28 PM Peter Maydell <peter.maydell@linaro.org> wrote:
>
> On Thu, 30 Apr 2026 at 06:23, <alistair23@gmail.com> wrote:
> >
> > From: Alistair Francis <alistair.francis@wdc.com>
> >
> > In QEMU 10.0 we deprecated the default spike machine, let's finally
> > remove spike as the default and require users to specify the machine.
> >
> > Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> > ---
> >  docs/about/deprecated.rst | 19 -------------------
> >  hw/riscv/spike.c          |  1 -
> >  2 files changed, 20 deletions(-)
>
> Generally when we move something from "deprecated" to
> "dropped" we add an entry to removed-features.rst
> (often more or less the same text that we take out of
> deprecated.rst).

Good idea, I added this diff to this commit

diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
index 626162022a..e5a8206523 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -1186,6 +1186,19 @@ Arm ``highbank`` and ``midway`` machines
(removed in 11.0)
There were no known users left for these machines. If you just want to
boot a Cortex-A15 or Cortex-A9 Linux, use the ``virt`` machine instead.

+RISC-V default machine (removed in 11.1)
+''''''''''''''''''''''''''''''''''''''''
+
+RISC-V used to define ``spike`` as the default machine if no machine option
+was given via the command line.  This happend because ``spike`` was 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.
+
+The default machine option has been removed, forcing users to always set the
+machine they want to use to avoid confusion.  Existing users of the ``spike``
+machine must ensure that they're setting the ``spike`` machine in the
+command line (``-M spike``).

linux-user mode CPUs
--------------------

Alistair

>
> -- PMM