Future S390 hardware generations may decide to drop CPU features
completely, thus rendering guests running with such features incapable
of migrating to newer machines. This results in a problem whereas the
user must manually disable features ahead of time to prepare a guest for
migration in a mixed environment.

To circumvent this issue, a "host-recommended" CPU model has been
introduced, which is the host-model with delta changes that disable
features that have been flagged as deprecated.

Signed-off-by: Collin Walling <walling@linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
---
 src/qemu/qemu_monitor.h      | 1 +
 src/qemu/qemu_monitor_json.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 6c590933aa..d3f63e0703 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1144,6 +1144,7 @@ struct _qemuMonitorCPUModelInfo {
 typedef enum {
     QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC,
     QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC_FULL,
+    QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC_REC,
     QEMU_MONITOR_CPU_MODEL_EXPANSION_FULL,
 } qemuMonitorCPUModelExpansionType;
 
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 5b9edadcf7..7b2aee7a42 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -5062,7 +5062,9 @@ qemuMonitorJSONQueryCPUModelExpansionOne(qemuMonitor *mon,
     case QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC_FULL:
         typeStr = "static";
         break;
-
+    case QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC_REC:
+        typeStr = "static-recommended";
+        break;
     case QEMU_MONITOR_CPU_MODEL_EXPANSION_FULL:
         typeStr = "full";
         break;
-- 
2.41.0