From patchwork Fri Dec 2 21:18:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 9459209 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BE50A60585 for ; Fri, 2 Dec 2016 21:19:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E78D285A6 for ; Fri, 2 Dec 2016 21:19:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92096285AD; Fri, 2 Dec 2016 21:19:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2DC26285A6 for ; Fri, 2 Dec 2016 21:19:06 +0000 (UTC) Received: from localhost ([::1]:36480 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCvEX-0004dR-4n for patchwork-qemu-devel@patchwork.kernel.org; Fri, 02 Dec 2016 16:19:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCvDz-0004dB-D3 for qemu-devel@nongnu.org; Fri, 02 Dec 2016 16:18:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCvDw-0003GV-4x for qemu-devel@nongnu.org; Fri, 02 Dec 2016 16:18:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42916) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCvDv-0003GO-SY for qemu-devel@nongnu.org; Fri, 02 Dec 2016 16:18:28 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2038318DF5D for ; Fri, 2 Dec 2016 21:18:27 +0000 (UTC) Received: from localhost (ovpn-116-204.phx2.redhat.com [10.3.116.204]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uB2LIQb2007749; Fri, 2 Dec 2016 16:18:26 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 2 Dec 2016 19:18:00 -0200 Message-Id: <1480713496-11213-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1480713496-11213-1-git-send-email-ehabkost@redhat.com> References: <1480713496-11213-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 02 Dec 2016 21:18:27 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.9 01/17] qmp: Report QOM type name on query-cpu-definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The new typename attribute on query-cpu-definitions will be used to help management software use device-list-properties to check which properties can be set using -cpu or -global for the CPU model. Signed-off-by: Eduardo Habkost --- Patch originally submitted as: From: Eduardo Habkost Date: Wed, 16 Nov 2016 16:21:39 -0200 Message-Id: <1479320499-29818-1-git-send-email-ehabkost@redhat.com> Subject: [PATCH for-2.9] qmp: Report QOM type name on query-cpu-definitions --- qapi-schema.json | 5 ++++- target-arm/helper.c | 1 + target-i386/cpu.c | 1 + target-ppc/translate_init.c | 1 + target-s390x/cpu_models.c | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/qapi-schema.json b/qapi-schema.json index f3e9bfc..8d113f8 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3218,6 +3218,9 @@ # @unavailable-features: #optional List of properties that prevent # the CPU model from running in the current # host. (since 2.8) +# @typename: Type name that can be used as argument to @device-list-properties, +# to introspect properties configurable using -cpu or -global. +# (since 2.9) # # @unavailable-features is a list of QOM property names that # represent CPU model attributes that prevent the CPU from running. @@ -3239,7 +3242,7 @@ ## { 'struct': 'CpuDefinitionInfo', 'data': { 'name': 'str', '*migration-safe': 'bool', 'static': 'bool', - '*unavailable-features': [ 'str' ] } } + '*unavailable-features': [ 'str' ], 'typename': 'str' } } ## # @query-cpu-definitions: diff --git a/target-arm/helper.c b/target-arm/helper.c index b5b65ca..3fc01b5 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -5207,6 +5207,7 @@ static void arm_cpu_add_definition(gpointer data, gpointer user_data) info = g_malloc0(sizeof(*info)); info->name = g_strndup(typename, strlen(typename) - strlen("-" TYPE_ARM_CPU)); + info->q_typename = g_strdup(typename); entry = g_malloc0(sizeof(*entry)); entry->value = info; diff --git a/target-i386/cpu.c b/target-i386/cpu.c index de1f30e..93ead1a 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2234,6 +2234,7 @@ static void x86_cpu_definition_entry(gpointer data, gpointer user_data) info->name = x86_cpu_class_get_model_name(cc); x86_cpu_class_check_missing_features(cc, &info->unavailable_features); info->has_unavailable_features = true; + info->q_typename = g_strdup(object_class_get_name(oc)); entry = g_malloc0(sizeof(*entry)); entry->value = info; diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 626e031..19ef250 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -10305,6 +10305,7 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp) info = g_malloc0(sizeof(*info)); info->name = g_strdup(alias->alias); + info->q_typename = g_strdup(object_class_get_name(oc)); entry = g_malloc0(sizeof(*entry)); entry->value = info; diff --git a/target-s390x/cpu_models.c b/target-s390x/cpu_models.c index c1e729d..5b66d33 100644 --- a/target-s390x/cpu_models.c +++ b/target-s390x/cpu_models.c @@ -290,6 +290,7 @@ static void create_cpu_model_list(ObjectClass *klass, void *opaque) info->has_migration_safe = true; info->migration_safe = scc->is_migration_safe; info->q_static = scc->is_static; + info->q_typename = g_strdup(object_class_get_name(klass)); entry = g_malloc0(sizeof(*entry));