From patchwork Mon Sep 19 19:42:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 9340383 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 1981B6022E for ; Mon, 19 Sep 2016 19:49:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08E8D28E48 for ; Mon, 19 Sep 2016 19:49:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F221F29819; Mon, 19 Sep 2016 19:49:36 +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 7599F28E48 for ; Mon, 19 Sep 2016 19:49:36 +0000 (UTC) Received: from localhost ([::1]:57860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bm4ZL-0003Wc-Mr for patchwork-qemu-devel@patchwork.kernel.org; Mon, 19 Sep 2016 15:49:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bm4XT-0002AY-Gf for qemu-devel@nongnu.org; Mon, 19 Sep 2016 15:47:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bm4Vp-0003FL-G5 for qemu-devel@nongnu.org; Mon, 19 Sep 2016 15:45:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39278) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bm4Vp-0003FH-6R for qemu-devel@nongnu.org; Mon, 19 Sep 2016 15:45:57 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (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 9D14E31B306; Mon, 19 Sep 2016 19:45:56 +0000 (UTC) Received: from localhost (ovpn-116-9.phx2.redhat.com [10.3.116.9]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8JJjtr1009390; Mon, 19 Sep 2016 15:45:56 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Mon, 19 Sep 2016 16:42:55 -0300 Message-Id: <1474314175-24374-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1474314175-24374-1-git-send-email-ehabkost@redhat.com> References: <1474314175-24374-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 19 Sep 2016 19:45:56 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 5/5] target-i386: Return runnability information 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: , Cc: libvir-list@redhat.com, dahi@linux.vnet.ibm.com, Jiri Denemark , Markus Armbruster , Igor Mammedov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Fill the "unavailable-features" field on the x86 implementation of query-cpu-definitions. Cc: Jiri Denemark Cc: libvir-list@redhat.com Signed-off-by: Eduardo Habkost --- Changes v2 -> v3: * Create a x86_cpu_feature_name() function, to isolate the code that returns the property name Changes v1 -> v2: * Updated to the new schema: no @runnable field, and always report @unavailable-features as present --- target-i386/cpu.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index a755309..9b53ce5 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1987,6 +1987,24 @@ static inline void feat2prop(char *s) } } +/* Return the feature property name for a feature flag bit */ +static char *x86_cpu_feature_name(FeatureWord w, int bitnr) +{ + char **parts, *r; + + /*TODO: This can be simplified later, by: + * 1) Moving the aliases outside the feat_names array + * (making g_strsplit() unnecessary) + * 2) Replacing "_" with "-" on all entries + * (making feat2prop() unnecessary) + */ + parts = g_strsplit(feature_word_info[w].feat_names[bitnr], "|", 2); + r = g_strdup(parts[0]); + feat2prop(r); + g_strfreev(parts); + return r; +} + /* Compatibily hack to maintain legacy +-feat semantic, * where +-feat overwrites any feature set by * feat=on|feat even if the later is parsed after +-feat @@ -2105,6 +2123,41 @@ static void x86_cpu_report_filtered_features(X86CPU *cpu) } } +/* Check for missing features that may prevent the CPU class from + * running using the current machine and accelerator. + */ +static void x86_cpu_class_check_missing_features(X86CPUClass *xcc, + strList **missing_feats) +{ + X86CPU *xc; + FeatureWord w; + + if (xcc->kvm_required && !kvm_enabled()) { + strList *new = g_new0(strList, 1); + new->value = g_strdup("kvm");; + *missing_feats = new; + return; + } + + xc = X86_CPU(object_new(object_class_get_name(OBJECT_CLASS(xcc)))); + if (x86_cpu_filter_features(xc)) { + for (w = 0; w < FEATURE_WORDS; w++) { + uint32_t filtered = xc->filtered_features[w]; + int i; + for (i = 0; i < 32; i++) { + if (filtered & (1UL << i)) { + strList *new = g_new0(strList, 1); + new->value = x86_cpu_feature_name(w, i); + new->next = *missing_feats; + *missing_feats = new; + } + } + } + } + + object_unref(OBJECT(xc)); +} + /* Print all cpuid feature names in featureset */ static void listflags(FILE *f, fprintf_function print, const char **featureset) @@ -2197,6 +2250,8 @@ static void x86_cpu_definition_entry(gpointer data, gpointer user_data) info = g_malloc0(sizeof(*info)); info->name = x86_cpu_class_get_model_name(cc); + x86_cpu_class_check_missing_features(cc, &info->unavailable_features); + info->has_unavailable_features = true; entry = g_malloc0(sizeof(*entry)); entry->value = info;