As we added different valid gic-version option settings,
we forgot to update the hint in the error message produced
when the user specifies an invalid value:

$ qemu-system-aarch64 -M virt,help | grep gic-version
  gic-version=<string>   - Set GIC version. Valid values are 2, 3, 4, host and max
$ qemu-system-aarch64 -M virt,gic-version=bang
qemu-system-aarch64: Invalid gic-version value
Valid values are 3, 2, host, max.

Update the error string to match the one we use in the help text
for the option.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/arm/virt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 50865e8115..8dc999712c 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2971,7 +2971,7 @@ static void virt_set_gic_version(Object *obj, const char *value, Error **errp)
         vms->gic_version = VIRT_GIC_VERSION_MAX; /* Will probe later */
     } else {
         error_setg(errp, "Invalid gic-version value");
-        error_append_hint(errp, "Valid values are 3, 2, host, max.\n");
+        error_append_hint(errp, "Valid values are 2, 3, 4, host, and max.\n");
     }
 }
 
-- 
2.43.0

Peter Maydell <peter.maydell@linaro.org> writes:

> As we added different valid gic-version option settings,
> we forgot to update the hint in the error message produced
> when the user specifies an invalid value:
>
> $ qemu-system-aarch64 -M virt,help | grep gic-version
>   gic-version=<string>   - Set GIC version. Valid values are 2, 3, 4, host and max
> $ qemu-system-aarch64 -M virt,gic-version=bang
> qemu-system-aarch64: Invalid gic-version value
> Valid values are 3, 2, host, max.
>
> Update the error string to match the one we use in the help text
> for the option.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

On 19/2/26 12:02, Peter Maydell wrote:
> As we added different valid gic-version option settings,
> we forgot to update the hint in the error message produced
> when the user specifies an invalid value:
> 
> $ qemu-system-aarch64 -M virt,help | grep gic-version
>    gic-version=<string>   - Set GIC version. Valid values are 2, 3, 4, host and max
> $ qemu-system-aarch64 -M virt,gic-version=bang
> qemu-system-aarch64: Invalid gic-version value
> Valid values are 3, 2, host, max.
> 
> Update the error string to match the one we use in the help text
> for the option.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>   hw/arm/virt.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

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

> On 19. Feb 2026, at 12:02, Peter Maydell <peter.maydell@linaro.org> wrote:
> 
> As we added different valid gic-version option settings,
> we forgot to update the hint in the error message produced
> when the user specifies an invalid value:
> 
> $ qemu-system-aarch64 -M virt,help | grep gic-version
>  gic-version=<string>   - Set GIC version. Valid values are 2, 3, 4, host and max
> $ qemu-system-aarch64 -M virt,gic-version=bang
> qemu-system-aarch64: Invalid gic-version value
> Valid values are 3, 2, host, max.
> 
> Update the error string to match the one we use in the help text
> for the option.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Mohamed Mediouni <mohamed@unpredictable.fr>
> ---
> hw/arm/virt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 50865e8115..8dc999712c 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -2971,7 +2971,7 @@ static void virt_set_gic_version(Object *obj, const char *value, Error **errp)
>         vms->gic_version = VIRT_GIC_VERSION_MAX; /* Will probe later */
>     } else {
>         error_setg(errp, "Invalid gic-version value");
> -        error_append_hint(errp, "Valid values are 3, 2, host, max.\n");
> +        error_append_hint(errp, "Valid values are 2, 3, 4, host, and max.\n");
>     }
> }
> 
> -- 
> 2.43.0
> 
>