Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/812357/?format=api
{ "id": 812357, "url": "http://patchwork.ozlabs.org/api/patches/812357/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-47-marcandre.lureau@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170911110623.24981-47-marcandre.lureau@redhat.com>", "list_archive_url": null, "date": "2017-09-11T11:06:19", "name": "[v3,46/50] qapi: make s390 commands depend on TARGET_S390X", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "6dad834e0dc303fb78a00e6f37d950c4fc17414a", "submitter": { "id": 66774, "url": "http://patchwork.ozlabs.org/api/people/66774/?format=api", "name": "Marc-André Lureau", "email": "marcandre.lureau@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-47-marcandre.lureau@redhat.com/mbox/", "series": [ { "id": 2480, "url": "http://patchwork.ozlabs.org/api/series/2480/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2480", "date": "2017-09-11T11:05:33", "name": "Hi,", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/2480/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/812357/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/812357/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=marcandre.lureau@redhat.com" ], "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xrQyx1mxQz9rxl\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 11 Sep 2017 21:42:49 +1000 (AEST)", "from localhost ([::1]:56922 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1drN71-0002pv-Ab\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 07:42:47 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:43888)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <marcandre.lureau@redhat.com>) id 1drMa8-0006ub-OS\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:52 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <marcandre.lureau@redhat.com>) id 1drMa1-0007T2-90\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:48 -0400", "from mx1.redhat.com ([209.132.183.28]:35088)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <marcandre.lureau@redhat.com>)\n\tid 1drMa0-0007S9-Vc\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:41 -0400", "from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 1CDDE372569;\n\tMon, 11 Sep 2017 11:08:40 +0000 (UTC)", "from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 177C56EE39;\n\tMon, 11 Sep 2017 11:08:38 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 1CDDE372569", "From": "=?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Mon, 11 Sep 2017 13:06:19 +0200", "Message-Id": "<20170911110623.24981-47-marcandre.lureau@redhat.com>", "In-Reply-To": "<20170911110623.24981-1-marcandre.lureau@redhat.com>", "References": "<20170911110623.24981-1-marcandre.lureau@redhat.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.12", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tMon, 11 Sep 2017 11:08:40 +0000 (UTC)", "Content-Transfer-Encoding": "quoted-printable", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]", "X-Received-From": "209.132.183.28", "Subject": "[Qemu-devel] [PATCH v3 46/50] qapi: make s390 commands depend on\n\tTARGET_S390X", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "Cornelia Huck <cohuck@redhat.com>, Alexander Graf <agraf@suse.de>,\n\tarmbru@redhat.com, Christian Borntraeger <borntraeger@de.ibm.com>, \n\tPaolo Bonzini <pbonzini@redhat.com>, =?utf-8?q?Marc-Andr=C3=A9_Lureau?=\n\t<marcandre.lureau@redhat.com>, \"Dr. David Alan Gilbert\"\n\t<dgilbert@redhat.com>, \tRichard Henderson <rth@twiddle.net>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>\n---\n qapi-schema.json | 101 -------------------------------\n qapi/target.json | 104 ++++++++++++++++++++++++++++++++\n include/sysemu/arch_init.h | 7 ---\n hw/s390x/s390-skeys.c | 2 +-\n monitor.c | 14 -----\n qmp.c | 14 -----\n stubs/arch-query-cpu-model-baseline.c | 12 ----\n stubs/arch-query-cpu-model-comparison.c | 12 ----\n target/s390x/cpu_models.c | 5 +-\n stubs/Makefile.objs | 2 -\n 10 files changed, 108 insertions(+), 165 deletions(-)\n delete mode 100644 stubs/arch-query-cpu-model-baseline.c\n delete mode 100644 stubs/arch-query-cpu-model-comparison.c", "diff": "diff --git a/qapi-schema.json b/qapi-schema.json\nindex 5b689c71ad..b4a5f9abc5 100644\n--- a/qapi-schema.json\n+++ b/qapi-schema.json\n@@ -1771,27 +1771,6 @@\n { 'command': 'query-dump-guest-memory-capability',\n 'returns': 'DumpGuestMemoryCapability' }\n \n-##\n-# @dump-skeys:\n-#\n-# Dump guest's storage keys\n-#\n-# @filename: the path to the file to dump to\n-#\n-# This command is only supported on s390 architecture.\n-#\n-# Since: 2.5\n-#\n-# Example:\n-#\n-# -> { \"execute\": \"dump-skeys\",\n-# \"arguments\": { \"filename\": \"/tmp/skeys\" } }\n-# <- { \"return\": {} }\n-#\n-##\n-{ 'command': 'dump-skeys',\n- 'data': { 'filename': 'str' } }\n-\n ##\n # @object-add:\n #\n@@ -2126,46 +2105,6 @@\n }\n }\n \n-##\n-# @query-cpu-model-comparison:\n-#\n-# Compares two CPU models, returning how they compare in a specific\n-# configuration. The results indicates how both models compare regarding\n-# runnability. This result can be used by tooling to make decisions if a\n-# certain CPU model will run in a certain configuration or if a compatible\n-# CPU model has to be created by baselining.\n-#\n-# Usually, a CPU model is compared against the maximum possible CPU model\n-# of a certain configuration (e.g. the \"host\" model for KVM). If that CPU\n-# model is identical or a subset, it will run in that configuration.\n-#\n-# The result returned by this command may be affected by:\n-#\n-# * QEMU version: CPU models may look different depending on the QEMU version.\n-# (Except for CPU models reported as \"static\" in query-cpu-definitions.)\n-# * machine-type: CPU model may look different depending on the machine-type.\n-# (Except for CPU models reported as \"static\" in query-cpu-definitions.)\n-# * machine options (including accelerator): in some architectures, CPU models\n-# may look different depending on machine and accelerator options. (Except for\n-# CPU models reported as \"static\" in query-cpu-definitions.)\n-# * \"-cpu\" arguments and global properties: arguments to the -cpu option and\n-# global properties may affect expansion of CPU models. Using\n-# query-cpu-model-expansion while using these is not advised.\n-#\n-# Some architectures may not support comparing CPU models. s390x supports\n-# comparing CPU models.\n-#\n-# Returns: a CpuModelBaselineInfo. Returns an error if comparing CPU models is\n-# not supported, if a model cannot be used, if a model contains\n-# an unknown cpu definition name, unknown properties or properties\n-# with wrong types.\n-#\n-# Since: 2.8.0\n-##\n-{ 'command': 'query-cpu-model-comparison',\n- 'data': { 'modela': 'CpuModelInfo', 'modelb': 'CpuModelInfo' },\n- 'returns': 'CpuModelCompareInfo' }\n-\n ##\n # @CpuModelBaselineInfo:\n #\n@@ -2178,46 +2117,6 @@\n { 'struct': 'CpuModelBaselineInfo',\n 'data': { 'model': 'CpuModelInfo' } }\n \n-##\n-# @query-cpu-model-baseline:\n-#\n-# Baseline two CPU models, creating a compatible third model. The created\n-# model will always be a static, migration-safe CPU model (see \"static\"\n-# CPU model expansion for details).\n-#\n-# This interface can be used by tooling to create a compatible CPU model out\n-# two CPU models. The created CPU model will be identical to or a subset of\n-# both CPU models when comparing them. Therefore, the created CPU model is\n-# guaranteed to run where the given CPU models run.\n-#\n-# The result returned by this command may be affected by:\n-#\n-# * QEMU version: CPU models may look different depending on the QEMU version.\n-# (Except for CPU models reported as \"static\" in query-cpu-definitions.)\n-# * machine-type: CPU model may look different depending on the machine-type.\n-# (Except for CPU models reported as \"static\" in query-cpu-definitions.)\n-# * machine options (including accelerator): in some architectures, CPU models\n-# may look different depending on machine and accelerator options. (Except for\n-# CPU models reported as \"static\" in query-cpu-definitions.)\n-# * \"-cpu\" arguments and global properties: arguments to the -cpu option and\n-# global properties may affect expansion of CPU models. Using\n-# query-cpu-model-expansion while using these is not advised.\n-#\n-# Some architectures may not support baselining CPU models. s390x supports\n-# baselining CPU models.\n-#\n-# Returns: a CpuModelBaselineInfo. Returns an error if baselining CPU models is\n-# not supported, if a model cannot be used, if a model contains\n-# an unknown cpu definition name, unknown properties or properties\n-# with wrong types.\n-#\n-# Since: 2.8.0\n-##\n-{ 'command': 'query-cpu-model-baseline',\n- 'data': { 'modela': 'CpuModelInfo',\n- 'modelb': 'CpuModelInfo' },\n- 'returns': 'CpuModelBaselineInfo' }\n-\n ##\n # @AddfdInfo:\n #\ndiff --git a/qapi/target.json b/qapi/target.json\nindex a764377ebf..3b73a9202f 100644\n--- a/qapi/target.json\n+++ b/qapi/target.json\n@@ -20,3 +20,107 @@\n ##\n { 'command': 'rtc-reset-reinjection',\n 'if': 'defined(TARGET_I386)' }\n+\n+##\n+# @dump-skeys:\n+#\n+# Dump guest's storage keys\n+#\n+# @filename: the path to the file to dump to\n+#\n+# This command is only supported on s390 architecture.\n+#\n+# Since: 2.5\n+#\n+# Example:\n+#\n+# -> { \"execute\": \"dump-skeys\",\n+# \"arguments\": { \"filename\": \"/tmp/skeys\" } }\n+# <- { \"return\": {} }\n+#\n+##\n+{ 'command': 'dump-skeys',\n+ 'data': { 'filename': 'str' },\n+ 'if': 'defined(TARGET_S390X)' }\n+\n+##\n+# @query-cpu-model-comparison:\n+#\n+# Compares two CPU models, returning how they compare in a specific\n+# configuration. The results indicates how both models compare regarding\n+# runnability. This result can be used by tooling to make decisions if a\n+# certain CPU model will run in a certain configuration or if a compatible\n+# CPU model has to be created by baselining.\n+#\n+# Usually, a CPU model is compared against the maximum possible CPU model\n+# of a certain configuration (e.g. the \"host\" model for KVM). If that CPU\n+# model is identical or a subset, it will run in that configuration.\n+#\n+# The result returned by this command may be affected by:\n+#\n+# * QEMU version: CPU models may look different depending on the QEMU version.\n+# (Except for CPU models reported as \"static\" in query-cpu-definitions.)\n+# * machine-type: CPU model may look different depending on the machine-type.\n+# (Except for CPU models reported as \"static\" in query-cpu-definitions.)\n+# * machine options (including accelerator): in some architectures, CPU models\n+# may look different depending on machine and accelerator options. (Except for\n+# CPU models reported as \"static\" in query-cpu-definitions.)\n+# * \"-cpu\" arguments and global properties: arguments to the -cpu option and\n+# global properties may affect expansion of CPU models. Using\n+# query-cpu-model-expansion while using these is not advised.\n+#\n+# Some architectures may not support comparing CPU models. s390x supports\n+# comparing CPU models.\n+#\n+# Returns: a CpuModelBaselineInfo. Returns an error if comparing CPU models is\n+# not supported, if a model cannot be used, if a model contains\n+# an unknown cpu definition name, unknown properties or properties\n+# with wrong types.\n+#\n+# Since: 2.8.0\n+##\n+{ 'command': 'query-cpu-model-comparison',\n+ 'data': { 'modela': 'CpuModelInfo', 'modelb': 'CpuModelInfo' },\n+ 'returns': 'CpuModelCompareInfo',\n+ 'if': 'defined(TARGET_S390X)' }\n+\n+##\n+# @query-cpu-model-baseline:\n+#\n+# Baseline two CPU models, creating a compatible third model. The created\n+# model will always be a static, migration-safe CPU model (see \"static\"\n+# CPU model expansion for details).\n+#\n+# This interface can be used by tooling to create a compatible CPU model out\n+# two CPU models. The created CPU model will be identical to or a subset of\n+# both CPU models when comparing them. Therefore, the created CPU model is\n+# guaranteed to run where the given CPU models run.\n+#\n+# The result returned by this command may be affected by:\n+#\n+# * QEMU version: CPU models may look different depending on the QEMU version.\n+# (Except for CPU models reported as \"static\" in query-cpu-definitions.)\n+# * machine-type: CPU model may look different depending on the machine-type.\n+# (Except for CPU models reported as \"static\" in query-cpu-definitions.)\n+# * machine options (including accelerator): in some architectures, CPU models\n+# may look different depending on machine and accelerator options. (Except for\n+# CPU models reported as \"static\" in query-cpu-definitions.)\n+# * \"-cpu\" arguments and global properties: arguments to the -cpu option and\n+# global properties may affect expansion of CPU models. Using\n+# query-cpu-model-expansion while using these is not advised.\n+#\n+# Some architectures may not support baselining CPU models. s390x supports\n+# baselining CPU models.\n+#\n+# Returns: a CpuModelBaselineInfo. Returns an error if baselining CPU models is\n+# not supported, if a model cannot be used, if a model contains\n+# an unknown cpu definition name, unknown properties or properties\n+# with wrong types.\n+#\n+# Since: 2.8.0\n+##\n+{ 'command': 'query-cpu-model-baseline',\n+ 'data': { 'modela': 'CpuModelInfo',\n+ 'modelb': 'CpuModelInfo' },\n+ 'returns': 'CpuModelBaselineInfo',\n+ 'if': 'defined(TARGET_S390X)' }\ndiff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h\nindex 8751c468ed..f193f5189b 100644\n--- a/include/sysemu/arch_init.h\n+++ b/include/sysemu/arch_init.h\n@@ -35,11 +35,4 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp);\n CpuModelExpansionInfo *arch_query_cpu_model_expansion(CpuModelExpansionType type,\n CpuModelInfo *mode,\n Error **errp);\n-CpuModelCompareInfo *arch_query_cpu_model_comparison(CpuModelInfo *modela,\n- CpuModelInfo *modelb,\n- Error **errp);\n-CpuModelBaselineInfo *arch_query_cpu_model_baseline(CpuModelInfo *modela,\n- CpuModelInfo *modelb,\n- Error **errp);\n-\n #endif\ndiff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c\nindex 53ad5d38d4..5af2f89994 100644\n--- a/hw/s390x/s390-skeys.c\n+++ b/hw/s390x/s390-skeys.c\n@@ -11,7 +11,7 @@\n \n #include \"qemu/osdep.h\"\n #include \"hw/boards.h\"\n-#include \"qmp-commands.h\"\n+#include \"target-qmp-commands.h\"\n #include \"hw/s390x/storage-keys.h\"\n #include \"qemu/error-report.h\"\n #include \"sysemu/kvm.h\"\ndiff --git a/monitor.c b/monitor.c\nindex ff93d9a9a9..622ba3b819 100644\n--- a/monitor.c\n+++ b/monitor.c\n@@ -971,19 +971,12 @@ static void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data,\n */\n static void qmp_unregister_commands_hack(void)\n {\n-#ifndef TARGET_S390X\n- qmp_unregister_command(&qmp_commands, \"dump-skeys\");\n-#endif\n #ifndef TARGET_ARM\n qmp_unregister_command(&qmp_commands, \"query-gic-capabilities\");\n #endif\n #if !defined(TARGET_S390X) && !defined(TARGET_I386)\n qmp_unregister_command(&qmp_commands, \"query-cpu-model-expansion\");\n #endif\n-#if !defined(TARGET_S390X)\n- qmp_unregister_command(&qmp_commands, \"query-cpu-model-baseline\");\n- qmp_unregister_command(&qmp_commands, \"query-cpu-model-comparison\");\n-#endif\n #if !defined(TARGET_PPC) && !defined(TARGET_ARM) && !defined(TARGET_I386) \\\n && !defined(TARGET_S390X)\n qmp_unregister_command(&qmp_commands, \"query-cpu-definitions\");\n@@ -4152,13 +4145,6 @@ QemuOptsList qemu_mon_opts = {\n },\n };\n \n-#ifndef TARGET_S390X\n-void qmp_dump_skeys(const char *filename, Error **errp)\n-{\n- error_setg(errp, QERR_FEATURE_DISABLED, \"dump-skeys\");\n-}\n-#endif\n-\n #ifndef TARGET_ARM\n GICCapabilityList *qmp_query_gic_capabilities(Error **errp)\n {\ndiff --git a/qmp.c b/qmp.c\nindex 90816ba283..7b6861846f 100644\n--- a/qmp.c\n+++ b/qmp.c\n@@ -553,20 +553,6 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,\n return arch_query_cpu_model_expansion(type, model, errp);\n }\n \n-CpuModelCompareInfo *qmp_query_cpu_model_comparison(CpuModelInfo *modela,\n- CpuModelInfo *modelb,\n- Error **errp)\n-{\n- return arch_query_cpu_model_comparison(modela, modelb, errp);\n-}\n-\n-CpuModelBaselineInfo *qmp_query_cpu_model_baseline(CpuModelInfo *modela,\n- CpuModelInfo *modelb,\n- Error **errp)\n-{\n- return arch_query_cpu_model_baseline(modela, modelb, errp);\n-}\n-\n void qmp_add_client(const char *protocol, const char *fdname,\n bool has_skipauth, bool skipauth, bool has_tls, bool tls,\n Error **errp)\ndiff --git a/stubs/arch-query-cpu-model-baseline.c b/stubs/arch-query-cpu-model-baseline.c\ndeleted file mode 100644\nindex 094ec13c2c..0000000000\n--- a/stubs/arch-query-cpu-model-baseline.c\n+++ /dev/null\n@@ -1,12 +0,0 @@\n-#include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n-#include \"sysemu/arch_init.h\"\n-#include \"qapi/qmp/qerror.h\"\n-\n-CpuModelBaselineInfo *arch_query_cpu_model_baseline(CpuModelInfo *modela,\n- CpuModelInfo *modelb,\n- Error **errp)\n-{\n- error_setg(errp, QERR_UNSUPPORTED);\n- return NULL;\n-}\ndiff --git a/stubs/arch-query-cpu-model-comparison.c b/stubs/arch-query-cpu-model-comparison.c\ndeleted file mode 100644\nindex d5486ae980..0000000000\n--- a/stubs/arch-query-cpu-model-comparison.c\n+++ /dev/null\n@@ -1,12 +0,0 @@\n-#include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n-#include \"sysemu/arch_init.h\"\n-#include \"qapi/qmp/qerror.h\"\n-\n-CpuModelCompareInfo *arch_query_cpu_model_comparison(CpuModelInfo *modela,\n- CpuModelInfo *modelb,\n- Error **errp)\n-{\n- error_setg(errp, QERR_UNSUPPORTED);\n- return NULL;\n-}\ndiff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\nindex 18cbf91d9c..5f8151925a 100644\n--- a/target/s390x/cpu_models.c\n+++ b/target/s390x/cpu_models.c\n@@ -25,6 +25,7 @@\n #ifndef CONFIG_USER_ONLY\n #include \"sysemu/arch_init.h\"\n #endif\n+#include \"target-qmp-commands.h\"\n \n #define CPUDEF_INIT(_type, _gen, _ec_ga, _mha_pow, _hmfai, _name, _desc) \\\n { \\\n@@ -562,7 +563,7 @@ static void list_add_feat(const char *name, void *opaque)\n *last = entry;\n }\n \n-CpuModelCompareInfo *arch_query_cpu_model_comparison(CpuModelInfo *infoa,\n+CpuModelCompareInfo *qmp_query_cpu_model_comparison(CpuModelInfo *infoa,\n CpuModelInfo *infob,\n Error **errp)\n {\n@@ -635,7 +636,7 @@ CpuModelCompareInfo *arch_query_cpu_model_comparison(CpuModelInfo *infoa,\n return compare_info;\n }\n \n-CpuModelBaselineInfo *arch_query_cpu_model_baseline(CpuModelInfo *infoa,\n+CpuModelBaselineInfo *qmp_query_cpu_model_baseline(CpuModelInfo *infoa,\n CpuModelInfo *infob,\n Error **errp)\n {\ndiff --git a/stubs/Makefile.objs b/stubs/Makefile.objs\nindex 4a33495911..5419f0f995 100644\n--- a/stubs/Makefile.objs\n+++ b/stubs/Makefile.objs\n@@ -1,7 +1,5 @@\n stub-obj-y += arch-query-cpu-def.o\n stub-obj-y += arch-query-cpu-model-expansion.o\n-stub-obj-y += arch-query-cpu-model-comparison.o\n-stub-obj-y += arch-query-cpu-model-baseline.o\n stub-obj-y += bdrv-next-monitor-owned.o\n stub-obj-y += blk-commit-all.o\n stub-obj-y += blockdev-close-all-bdrv-states.o\n", "prefixes": [ "v3", "46/50" ] }