qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] target/s390x: improve cpu compatibility check error message
@ 2024-03-14 19:00 Claudio Fontana
  2024-03-14 19:44 ` Nina Schoetterl-Glausch
  2024-03-15 12:25 ` Christian Borntraeger
  0 siblings, 2 replies; 5+ messages in thread
From: Claudio Fontana @ 2024-03-14 19:00 UTC (permalink / raw)
  To: Thomas Huth, Nina Schoetterl-Glausch
  Cc: Claudio Fontana, qemu-devel, qemu-s390x, Ilya Leoshkevich

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>
---
 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)
-- 
2.26.2



^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-03-15 12:26 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-14 19:00 [PATCH] target/s390x: improve cpu compatibility check error message Claudio Fontana
2024-03-14 19:44 ` Nina Schoetterl-Glausch
2024-03-14 20:10   ` Claudio Fontana
2024-03-14 20:26     ` Claudio Fontana
2024-03-15 12:25 ` Christian Borntraeger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).