From: Eduardo Habkost <ehabkost@redhat.com> To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, mprivozn@redhat.com, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] qmp: Add deprecation information to query-machines Date: Tue, 23 Apr 2019 18:22:46 -0300 [thread overview] Message-ID: <20190423212246.3542-4-ehabkost@redhat.com> (raw) In-Reply-To: <20190423212246.3542-1-ehabkost@redhat.com> Export machine type deprecation information through the query-machines QMP command. With this, libvirt and management software will be able to show this information to users and/or suggest changes to VM configuration to avoid deprecated machines. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- qapi/misc.json | 5 ++++- vl.c | 6 ++++++ tests/acceptance/query_machines.py | 27 +++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tests/acceptance/query_machines.py diff --git a/qapi/misc.json b/qapi/misc.json index 8b3ca4fdd3..941d251d17 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -2018,12 +2018,15 @@ # # @hotpluggable-cpus: cpu hotplug via -device is supported (since 2.7.0) # +# @support-status: Support/deprecation status information (since 4.1.0) +# # Since: 1.2.0 ## { 'struct': 'MachineInfo', 'data': { 'name': 'str', '*alias': 'str', '*is-default': 'bool', 'cpu-max': 'int', - 'hotpluggable-cpus': 'bool'} } + 'hotpluggable-cpus': 'bool', + 'support-status': 'SupportStatusInfo' } } ## # @query-machines: diff --git a/vl.c b/vl.c index 99b857ed2a..ca23d2a404 100644 --- a/vl.c +++ b/vl.c @@ -1530,6 +1530,12 @@ MachineInfoList *qmp_query_machines(Error **errp) info->name = g_strdup(mc->name); info->cpu_max = !mc->max_cpus ? 1 : mc->max_cpus; info->hotpluggable_cpus = mc->has_hotpluggable_cpus; + assert(!mc->support_status.status_message || + mc->support_status.has_status_message); + assert(!mc->support_status.suggested_alternative || + mc->support_status.has_suggested_alternative); + info->support_status = + QAPI_CLONE(SupportStatusInfo, &mc->support_status); entry = g_malloc0(sizeof(*entry)); entry->value = info; diff --git a/tests/acceptance/query_machines.py b/tests/acceptance/query_machines.py new file mode 100644 index 0000000000..23a56ea617 --- /dev/null +++ b/tests/acceptance/query_machines.py @@ -0,0 +1,27 @@ +# Sanity check query-machines QMP command results +# +# Copyright (c) 2019 Red Hat, Inc. +# +# Author: +# Eduardo Habkost <ehabkost@redhat.com> +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +from avocado_qemu import Test + +class QueryMachines(Test): + def test(self): + self.vm.launch() + machines = self.vm.command('query-machines') + machinesdict = dict((m['name'], m) for m in machines) + machinesdict.update((m['alias'], m) for m in machines if 'alias' in m) + for machine in machines: + status = machine['support-status'] + if status['deprecated']: + self.assertTrue(status.get('status-message') or \ + status.get('suggested-alternative'), + "Deprecated machine (%s) must have status-message or suggested-alternative" % (machine['name'])) + if 'suggested-alternative' in status: + self.assertTrue(status['suggested-alternative'] in machinesdict, + "suggested-alternative of %s must point to a valid machine type" % (machine['name'])) -- 2.18.0.rc1.1.g3f1ff2140
WARNING: multiple messages have this Message-ID (diff)
From: Eduardo Habkost <ehabkost@redhat.com> To: qemu-devel@nongnu.org Cc: mprivozn@redhat.com, Markus Armbruster <armbru@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] qmp: Add deprecation information to query-machines Date: Tue, 23 Apr 2019 18:22:46 -0300 [thread overview] Message-ID: <20190423212246.3542-4-ehabkost@redhat.com> (raw) Message-ID: <20190423212246.TbPWAJG8uzy7X6jizFFqWHMOI3ORopSNlOp_7K0CziY@z> (raw) In-Reply-To: <20190423212246.3542-1-ehabkost@redhat.com> Export machine type deprecation information through the query-machines QMP command. With this, libvirt and management software will be able to show this information to users and/or suggest changes to VM configuration to avoid deprecated machines. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- qapi/misc.json | 5 ++++- vl.c | 6 ++++++ tests/acceptance/query_machines.py | 27 +++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tests/acceptance/query_machines.py diff --git a/qapi/misc.json b/qapi/misc.json index 8b3ca4fdd3..941d251d17 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -2018,12 +2018,15 @@ # # @hotpluggable-cpus: cpu hotplug via -device is supported (since 2.7.0) # +# @support-status: Support/deprecation status information (since 4.1.0) +# # Since: 1.2.0 ## { 'struct': 'MachineInfo', 'data': { 'name': 'str', '*alias': 'str', '*is-default': 'bool', 'cpu-max': 'int', - 'hotpluggable-cpus': 'bool'} } + 'hotpluggable-cpus': 'bool', + 'support-status': 'SupportStatusInfo' } } ## # @query-machines: diff --git a/vl.c b/vl.c index 99b857ed2a..ca23d2a404 100644 --- a/vl.c +++ b/vl.c @@ -1530,6 +1530,12 @@ MachineInfoList *qmp_query_machines(Error **errp) info->name = g_strdup(mc->name); info->cpu_max = !mc->max_cpus ? 1 : mc->max_cpus; info->hotpluggable_cpus = mc->has_hotpluggable_cpus; + assert(!mc->support_status.status_message || + mc->support_status.has_status_message); + assert(!mc->support_status.suggested_alternative || + mc->support_status.has_suggested_alternative); + info->support_status = + QAPI_CLONE(SupportStatusInfo, &mc->support_status); entry = g_malloc0(sizeof(*entry)); entry->value = info; diff --git a/tests/acceptance/query_machines.py b/tests/acceptance/query_machines.py new file mode 100644 index 0000000000..23a56ea617 --- /dev/null +++ b/tests/acceptance/query_machines.py @@ -0,0 +1,27 @@ +# Sanity check query-machines QMP command results +# +# Copyright (c) 2019 Red Hat, Inc. +# +# Author: +# Eduardo Habkost <ehabkost@redhat.com> +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +from avocado_qemu import Test + +class QueryMachines(Test): + def test(self): + self.vm.launch() + machines = self.vm.command('query-machines') + machinesdict = dict((m['name'], m) for m in machines) + machinesdict.update((m['alias'], m) for m in machines if 'alias' in m) + for machine in machines: + status = machine['support-status'] + if status['deprecated']: + self.assertTrue(status.get('status-message') or \ + status.get('suggested-alternative'), + "Deprecated machine (%s) must have status-message or suggested-alternative" % (machine['name'])) + if 'suggested-alternative' in status: + self.assertTrue(status['suggested-alternative'] in machinesdict, + "suggested-alternative of %s must point to a valid machine type" % (machine['name'])) -- 2.18.0.rc1.1.g3f1ff2140
next prev parent reply other threads:[~2019-04-23 21:23 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-23 21:22 [Qemu-devel] [PATCH 0/3] Export machine type deprecation info through QMP Eduardo Habkost 2019-04-23 21:22 ` Eduardo Habkost 2019-04-23 21:22 ` [Qemu-devel] [PATCH 1/3] qapi: SupportStatusInfo struct Eduardo Habkost 2019-04-23 21:22 ` Eduardo Habkost 2019-04-23 22:23 ` Philippe Mathieu-Daudé 2019-04-24 18:24 ` Eduardo Habkost 2019-04-24 18:24 ` Eduardo Habkost 2019-04-24 8:26 ` Daniel P. Berrangé 2019-04-24 8:26 ` Daniel P. Berrangé 2019-04-24 18:20 ` Eduardo Habkost 2019-04-24 18:20 ` Eduardo Habkost 2019-04-30 10:10 ` Daniel P. Berrangé 2019-04-30 10:10 ` Daniel P. Berrangé 2019-04-30 12:42 ` Eduardo Habkost 2019-04-30 12:42 ` Eduardo Habkost 2019-04-30 12:47 ` Daniel P. Berrangé 2019-04-30 12:47 ` Daniel P. Berrangé 2019-04-25 14:20 ` Wainer dos Santos Moschetta 2019-04-25 17:42 ` Eduardo Habkost 2019-04-25 17:42 ` Eduardo Habkost 2019-04-30 10:03 ` Daniel P. Berrangé 2019-04-30 10:03 ` Daniel P. Berrangé 2019-04-23 21:22 ` [Qemu-devel] [PATCH 2/3] machine: Use SupportStatusInfo for deprecation info Eduardo Habkost 2019-04-23 21:22 ` Eduardo Habkost 2019-04-23 22:26 ` Philippe Mathieu-Daudé 2019-04-23 22:26 ` Philippe Mathieu-Daudé 2019-04-24 1:37 ` David Gibson 2019-04-24 1:37 ` David Gibson 2019-04-24 8:23 ` Daniel P. Berrangé 2019-04-24 8:23 ` Daniel P. Berrangé 2019-04-24 18:29 ` Eduardo Habkost 2019-04-24 18:29 ` Eduardo Habkost 2019-04-23 21:22 ` Eduardo Habkost [this message] 2019-04-23 21:22 ` [Qemu-devel] [PATCH 3/3] qmp: Add deprecation information to query-machines Eduardo Habkost 2019-04-24 8:28 ` Daniel P. Berrangé 2019-04-24 8:28 ` Daniel P. Berrangé 2019-04-25 14:54 ` Wainer dos Santos Moschetta 2019-04-25 17:43 ` Eduardo Habkost 2019-04-25 17:43 ` Eduardo Habkost 2019-04-23 21:28 ` [Qemu-devel] [PATCH 0/3] Export machine type deprecation info through QMP no-reply 2019-04-23 21:28 ` no-reply 2019-04-24 7:56 ` Thomas Huth 2019-04-24 8:31 ` Daniel P. Berrangé 2019-04-24 8:31 ` Daniel P. Berrangé 2019-04-24 18:14 ` Eduardo Habkost 2019-04-24 18:14 ` Eduardo Habkost 2019-04-24 18:10 ` Eduardo Habkost 2019-04-24 18:10 ` Eduardo Habkost 2019-04-25 7:38 ` Thomas Huth 2019-04-25 7:38 ` Thomas Huth 2019-04-30 10:11 ` Daniel P. Berrangé 2019-04-30 10:11 ` Daniel P. Berrangé 2019-04-24 8:23 ` Michal Privoznik 2019-04-24 8:23 ` Michal Privoznik 2019-05-07 5:07 ` Markus Armbruster 2019-05-07 16:18 ` Eduardo Habkost 2019-05-08 9:16 ` Markus Armbruster 2019-05-08 20:28 ` Eduardo Habkost 2019-05-09 8:31 ` Markus Armbruster 2019-05-09 9:14 ` Daniel P. Berrangé 2019-05-09 15:52 ` Eduardo Habkost 2019-05-09 16:08 ` Daniel P. Berrangé 2019-05-09 17:44 ` Eduardo Habkost 2019-05-10 6:28 ` Markus Armbruster 2019-05-10 17:03 ` Eduardo Habkost 2019-05-10 6:19 ` Markus Armbruster 2019-05-10 17:00 ` Eduardo Habkost 2019-05-09 18:19 ` Eduardo Habkost 2019-05-10 9:29 ` Markus Armbruster 2019-05-10 17:17 ` Eduardo Habkost 2019-05-10 17:26 ` Daniel P. Berrangé 2019-05-13 11:49 ` Markus Armbruster
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190423212246.3542-4-ehabkost@redhat.com \ --to=ehabkost@redhat.com \ --cc=armbru@redhat.com \ --cc=eblake@redhat.com \ --cc=marcel.apfelbaum@gmail.com \ --cc=mprivozn@redhat.com \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.