From patchwork Fri May 6 18:11:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 9035761 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 777099F1D3 for ; Fri, 6 May 2016 18:15:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C3B41202E9 for ; Fri, 6 May 2016 18:15:41 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 05E0B20165 for ; Fri, 6 May 2016 18:15:41 +0000 (UTC) Received: from localhost ([::1]:59680 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aykHp-0001GL-Lh for patchwork-qemu-devel@patchwork.kernel.org; Fri, 06 May 2016 14:15:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aykEn-0003kp-9S for qemu-devel@nongnu.org; Fri, 06 May 2016 14:12:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aykES-000458-0p for qemu-devel@nongnu.org; Fri, 06 May 2016 14:12:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55386) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aykER-00040W-Pj for qemu-devel@nongnu.org; Fri, 06 May 2016 14:12:07 -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 BACF8C062CE7; Fri, 6 May 2016 18:11:56 +0000 (UTC) Received: from localhost (vpn1-6-198.gru2.redhat.com [10.97.6.198]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u46IBthp010945; Fri, 6 May 2016 14:11:56 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 6 May 2016 15:11:32 -0300 Message-Id: <1462558292-2126-10-git-send-email-ehabkost@redhat.com> In-Reply-To: <1462558292-2126-1-git-send-email-ehabkost@redhat.com> References: <1462558292-2126-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 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 9/9] 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, Igor Mammedov , Jiri Denemark , =?UTF-8?q?Andreas=20F=C3=A4rber?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fill the "runnable" and "unavailable-features" fields on the x86 implementation of query-cpu-definitions. Example command output: { "return": [ { "runnable": true, "name": "host"}, { "runnable": true, "name": "qemu64"}, { "runnable": true, "name": "qemu32"}, { "runnable": false, "name": "phenom", "unavailable-features": ["npt", "sse4a", "3dnow", "3dnowext", "fxsr-opt", "mmxext"] }, { "runnable": true, "name": "pentium3"}, { "runnable": true, "name": "pentium2"}, { "runnable": true, "name": "pentium"}, { "runnable": true, "name": "n270"}, { "runnable": true, "name": "kvm64"}, { "runnable": true, "name": "kvm32"}, { "runnable": true, "name": "coreduo"}, { "runnable": true, "name": "core2duo"}, { "runnable": false, "name": "athlon", "unavailable-features": ["3dnow", "3dnowext", "mmxext"] }, { "runnable": true, "name": "Westmere"}, { "runnable": true, "name": "SandyBridge"}, { "runnable": true, "name": "Penryn"}, { "runnable": false, "name": "Opteron_G5", "unavailable-features": ["tbm", "fma4", "xop", "3dnowprefetch", "misalignsse", "sse4a"] }, { "runnable": false, "name": "Opteron_G4", "unavailable-features": ["fma4", "xop", "3dnowprefetch", "misalignsse", "sse4a"] }, { "runnable": false, "name": "Opteron_G3", "unavailable-features": ["misalignsse", "sse4a"] }, { "runnable": true, "name": "Opteron_G2"}, { "runnable": true, "name": "Opteron_G1"}, { "runnable": true, "name": "Nehalem"}, { "runnable": true, "name": "IvyBridge"}, { "runnable": false, "name": "Haswell", "unavailable-features": ["rtm", "hle"] }, { "runnable": true, "name": "Haswell-noTSX"}, { "runnable": true, "name": "Conroe"}, { "runnable": false, "name": "Broadwell", "unavailable-features": ["3dnowprefetch", "smap", "adx", "rdseed", "rtm", "hle"] }, { "runnable": false, "name": "Broadwell-noTSX", "unavailable-features": ["3dnowprefetch", "smap", "adx", "rdseed"] }, { "runnable": true, "name": "486"} ] } Cc: Jiri Denemark Cc: libvir-list@redhat.com Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index e7365d1..f6f0f83 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2041,6 +2041,41 @@ static void x86_cpu_report_filtered_features(X86CPU *cpu) } } +static bool x86_cpu_class_is_runnable(X86CPUClass *xcc, strList **missing_feats) +{ + X86CPU *xc; + bool r; + FeatureWord w; + + if (xcc->kvm_required && !kvm_enabled()) { + return false; + } + + xc = X86_CPU(object_new(object_class_get_name(OBJECT_CLASS(xcc)))); + r = !x86_cpu_filter_features(xc); + if (!r) { + for (w = 0; w < FEATURE_WORDS; w++) { + FeatureWordInfo *fi = &feature_word_info[w]; + uint32_t filtered = xc->filtered_features[w]; + int i; + for (i = 0; i < 32; i++) { + if (filtered & (1UL << i)) { + char **parts = g_strsplit(fi->feat_names[i], "|", 2); + strList *new = g_new0(strList, 1); + new->value = g_strdup(parts[0]); + feat2prop(new->value); + new->next = *missing_feats; + *missing_feats = new; + g_strfreev(parts); + } + } + } + } + + object_unref(OBJECT(xc)); + return r; +} + /* Print all cpuid feature names in featureset */ static void listflags(FILE *f, fprintf_function print, const char **featureset) @@ -2133,6 +2168,11 @@ 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); + info->has_runnable = true; + info->runnable = x86_cpu_class_is_runnable(cc, &info->unavailable_features); + if (!info->runnable) { + info->has_unavailable_features = true; + } entry = g_malloc0(sizeof(*entry)); entry->value = info;