Re: [PATCH] target/s390x: improve cpu compatibility check error message

[Christian Borntraeger]

Am 14.03.24 um 20:00 schrieb Claudio Fontana:
> some users were confused by this message showing under TCG:
>
> Selected CPU generation is too new. Maximum supported model
> in the configuration: 'xyz'
>
> Try to clarify that the maximum can depend on the accel by
> adding also the current accelerator to the message as such:
>
> Selected CPU generation is too new. Maximum supported model
> in the accelerator 'tcg' configuration: 'xyz'
>
> Signed-off-by: Claudio Fontana <cfontana@suse.de>

Independent on which message we end up with (see comments
in this mail thread), I agree that improving the
error message is helpful.

Acked-by: Christian Borntraeger <borntraeger@linux.ibm.com>

> ---
>   target/s390x/cpu_models.c | 11 ++++++-----
>   1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
> index 1a1c096122..0d6d8fc727 100644
> --- a/target/s390x/cpu_models.c
> +++ b/target/s390x/cpu_models.c
> @@ -508,14 +508,14 @@ static void check_compatibility(const S390CPUModel 
> *max_model,
>   
>       if (model->def->gen > max_model->def->gen) {
>           error_setg(errp, "Selected CPU generation is too new. Maximum "
> -                   "supported model in the configuration: \'%s\'",
> -                   max_model->def->name);
> +                   "supported model in the accelerator \'%s\' configuration: 
> \'%s\'",
> +                   current_accel_name(), max_model->def->name);
>           return;
>       } else if (model->def->gen == max_model->def->gen &&
>                  model->def->ec_ga > max_model->def->ec_ga) {
>           error_setg(errp, "Selected CPU GA level is too new. Maximum "
> -                   "supported model in the configuration: \'%s\'",
> -                   max_model->def->name);
> +                   "supported model in the accelerator \'%s\' configuration: 
> \'%s\'",
> +                   current_accel_name(), max_model->def->name);
>           return;
>       }
>   
> @@ -537,7 +537,8 @@ static void check_compatibility(const S390CPUModel *max_model,
>       error_setg(errp, " ");
>       s390_feat_bitmap_to_ascii(missing, errp, error_prepend_missing_feat);
>       error_prepend(errp, "Some features requested in the CPU model are not "
> -                  "available in the configuration: ");
> +                  "available in the accelerator \'%s\' configuration: ",
> +                  current_accel_name());
>   }
>   
>   S390CPUModel *get_max_cpu_model(Error **errp)