90057151bb
- s390x/sclp: Simplify get_sclp_device() - target/ppc: Remove msr_pr macro - docs/system/target-arm: Re-alphabetize board list - migration: Extend query-migrate to provide dirty page limit info - migration: Implement dirty-limit convergence algo - migration: Put the detection logic before auto-converge checking - migration: Refactor auto-converge capability logic - migration: Introduce dirty-limit capability - qapi/migration: Introduce vcpu-dirty-limit parameters - qapi/migration: Introduce x-vcpu-dirty-limit-period parameter - Change the value of no_ged from true to false - Allow UNIX socket option for VNC websocket - tpm_emulator: Avoid double initialization during - chardev/char-socket: Update AF_UNIX for Windows - KVM: dirty ring: add missing memory barrier - i386: reset KVM nested state upon CPU reset - esp: Handle CMD_BUSRESET by resetting the SCSI bus - dbus-vmstate: Restrict error checks to registered proxies in dbus_get_proxies - vfio/pci: Add Ascend310b scend910b support - target/i386: Export RFDS bit to guests - target/i386: Add new CPU model SierraForest - target/i386: Introduce Icelake-Server-v7 to enable TSX - hw/virtio: handle un-configured shutdown in virtio-pci - target/s390x: display deprecation status in '-cpu help' - target/i386: display deprecation status in '-cpu help' - pc-bios/s390-ccw: Fix booting with logical block size < physical block size Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
68 lines
2.3 KiB
Diff
68 lines
2.3 KiB
Diff
From 054d100649c34dd4e5a13140b09b8c080e85ffde Mon Sep 17 00:00:00 2001
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
Date: Tue, 30 Apr 2024 09:24:09 +0000
|
|
Subject: [PATCH] target/s390x: display deprecation status in '-cpu help'
|
|
mainline inclusion commit 738cdc2f6ea1ce22bb3f2a4e0fc84fc8121896fb category:
|
|
bugfix
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
---------------------------------------------------------------
|
|
|
|
When the user queries CPU models via QMP there is a 'deprecated' flag
|
|
present, however, this is not done for the CLI '-cpu help' command.
|
|
|
|
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
|
|
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
---
|
|
target/s390x/cpu_models.c | 23 ++++++++++++++++++-----
|
|
1 file changed, 18 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
|
|
index 11e06cc51f..65908c6d36 100644
|
|
--- a/target/s390x/cpu_models.c
|
|
+++ b/target/s390x/cpu_models.c
|
|
@@ -334,18 +334,31 @@ const S390CPUDef *s390_find_cpu_def(uint16_t type, uint8_t gen, uint8_t ec_ga,
|
|
static void s390_print_cpu_model_list_entry(gpointer data, gpointer user_data)
|
|
{
|
|
const S390CPUClass *scc = S390_CPU_CLASS((ObjectClass *)data);
|
|
+ CPUClass *cc = CPU_CLASS(scc);
|
|
char *name = g_strdup(object_class_get_name((ObjectClass *)data));
|
|
- const char *details = "";
|
|
+ g_autoptr(GString) details = g_string_new("");
|
|
|
|
if (scc->is_static) {
|
|
- details = "(static, migration-safe)";
|
|
- } else if (scc->is_migration_safe) {
|
|
- details = "(migration-safe)";
|
|
+ g_string_append(details, "static, ");
|
|
+ }
|
|
+ if (scc->is_migration_safe) {
|
|
+ g_string_append(details, "migration-safe, ");
|
|
+ }
|
|
+ if (cc->deprecation_note) {
|
|
+ g_string_append(details, "deprecated, ");
|
|
+ }
|
|
+ if (details->len) {
|
|
+ /* cull trailing ', ' */
|
|
+ g_string_truncate(details, details->len - 2);
|
|
}
|
|
|
|
/* strip off the -s390x-cpu */
|
|
g_strrstr(name, "-" TYPE_S390_CPU)[0] = 0;
|
|
- qemu_printf("s390 %-15s %-35s %s\n", name, scc->desc, details);
|
|
+ if (details->len) {
|
|
+ qemu_printf("s390 %-15s %-35s (%s)\n", name, scc->desc, details->str);
|
|
+ } else {
|
|
+ qemu_printf("s390 %-15s %-35s\n", name, scc->desc);
|
|
+ }
|
|
g_free(name);
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|