This optional parameter for query-cpu-model-expansion enables CPU
model features flagged as deprecated to appear in the resulting
list of properties.
This commit does not add support beyond adding a new argument
to the query. All queries with this option present will result
in an error claiming this option is not supported.
Signed-off-by: Collin Walling <wall...@linux.ibm.com>
---
qapi/machine-target.json | 7 ++++++-
target/arm/arm-qmp-cmds.c | 7 +++++++
target/i386/cpu-sysemu.c | 7 +++++++
target/s390x/cpu_models_sysemu.c | 7 +++++++
4 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/qapi/machine-target.json b/qapi/machine-target.json
index 29e695aa06..b9da284d2d 100644
--- a/qapi/machine-target.json
+++ b/qapi/machine-target.json
@@ -285,6 +285,10 @@
#
# @type: expansion type, specifying how to expand the CPU model
#
+# @disable-deprecated-feats: include CPU model features that are
+# flagged as deprecated. If supported, these features will appear
+# in the properties list paired with false.
+#
# Returns: a CpuModelExpansionInfo describing the expanded CPU model
#
# Errors:
@@ -298,7 +302,8 @@
##
{ 'command': 'query-cpu-model-expansion',
'data': { 'type': 'CpuModelExpansionType',
- 'model': 'CpuModelInfo' },
+ 'model': 'CpuModelInfo',
+ '*disable-deprecated-feats': 'bool' },
'returns': 'CpuModelExpansionInfo',
'if': { 'any': [ 'TARGET_S390X',
'TARGET_I386',
diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c
index 3cc8cc738b..1010d654e3 100644
--- a/target/arm/arm-qmp-cmds.c
+++ b/target/arm/arm-qmp-cmds.c
@@ -100,6 +100,8 @@ static const char *cpu_model_advertised_features[] = {
CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType
type,
CpuModelInfo *model,
+ bool
has_disable_deprecated_feats,
+ bool
disable_deprecated_feats,
Error **errp)
{
CpuModelExpansionInfo *expansion_info;
@@ -110,6 +112,11 @@ CpuModelExpansionInfo
*qmp_query_cpu_model_expansion(CpuModelExpansionType type,
const char *name;
int i;
+ if (has_disable_deprecated_feats) {
+ error_setg(&err, "Unsupported option 'disable-deprecated-feats'");
+ return NULL;
+ }
+
if (type != CPU_MODEL_EXPANSION_TYPE_FULL) {
error_setg(errp, "The requested expansion type is not supported");
return NULL;
diff --git a/target/i386/cpu-sysemu.c b/target/i386/cpu-sysemu.c
index 3f9093d285..c15786fb66 100644
--- a/target/i386/cpu-sysemu.c
+++ b/target/i386/cpu-sysemu.c
@@ -196,6 +196,8 @@ out:
CpuModelExpansionInfo *
qmp_query_cpu_model_expansion(CpuModelExpansionType type,
CpuModelInfo *model,
+ bool
has_disable_deprecated_feats,
+ bool
disable_deprecated_feats,
Error **errp)
{
X86CPU *xc = NULL;
@@ -204,6 +206,11 @@ qmp_query_cpu_model_expansion(CpuModelExpansionType type,
QDict *props = NULL;
const char *base_name;
+ if (has_disable_deprecated_feats) {
+ error_setg(&err, "Unsupported option 'disable-deprecated-feats'");
+ goto out;
+ }
+
xc = x86_cpu_from_model(model->name, model->props, "model.props", &err);
if (err) {
goto out;
diff --git a/target/s390x/cpu_models_sysemu.c b/target/s390x/cpu_models_sysemu.c
index 2d99218069..ef9fa80efd 100644
--- a/target/s390x/cpu_models_sysemu.c
+++ b/target/s390x/cpu_models_sysemu.c
@@ -210,6 +210,8 @@ static void cpu_info_from_model(CpuModelInfo *info, const
S390CPUModel *model,
CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType
type,
CpuModelInfo *model,
+ bool
has_disable_deprecated_feats,
+ bool
disable_deprecated_feats,
Error **errp)
{
Error *err = NULL;
@@ -217,6 +219,11 @@ CpuModelExpansionInfo
*qmp_query_cpu_model_expansion(CpuModelExpansionType type,
S390CPUModel s390_model;
bool delta_changes = false;
+ if (has_disable_deprecated_feats) {
+ error_setg(&err, "Unsupported option 'disable-deprecated-feats'");
+ return NULL;
+ }
+
/* convert it to our internal representation */
cpu_model_from_info(&s390_model, model, "model", &err);
if (err) {
--
2.43.0
