From patchwork Fri Aug 10 11:22:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 176467 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B0FE42C007F for ; Fri, 10 Aug 2012 21:45:38 +1000 (EST) Received: from localhost ([::1]:56966 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SznJr-0000Ry-U0 for incoming@patchwork.ozlabs.org; Fri, 10 Aug 2012 07:23:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SznJB-0007Wo-V5 for qemu-devel@nongnu.org; Fri, 10 Aug 2012 07:23:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SznJ9-0000gb-I6 for qemu-devel@nongnu.org; Fri, 10 Aug 2012 07:23:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SznJ9-0000gL-A4 for qemu-devel@nongnu.org; Fri, 10 Aug 2012 07:23:11 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7ABN8QP016352 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 10 Aug 2012 07:23:08 -0400 Received: from thinkpad.com (vpn-237-192.phx2.redhat.com [10.3.237.192]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q7ABMe14018842; Fri, 10 Aug 2012 07:23:05 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Fri, 10 Aug 2012 13:22:23 +0200 Message-Id: <1344597756-2890-8-git-send-email-imammedo@redhat.com> In-Reply-To: <1344597756-2890-1-git-send-email-imammedo@redhat.com> References: <1344597756-2890-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, gleb@redhat.com, jan.kiszka@siemens.com, mtosatti@redhat.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, avi@redhat.com, pbonzini@redhat.com, akong@redhat.com, lersek@redhat.com, afaerber@suse.de, ehabkost@redhat.com Subject: [Qemu-devel] [RFC 07/20] target-i386: convert cpuid features into properties X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Igor Mammedov --- target-i386/cpu.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index a47cc12..4b22598 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -605,6 +605,103 @@ static int check_features_against_host(x86_def_t *guest_def) return rv; } +static bool is_feature_set(const char *name, const uint32_t featbitmap, + const char **featureset) +{ + uint32_t mask; + + for (mask = 1; mask; mask <<= 1) { + if (featureset[ffs(mask) - 1] && + !altcmp(name, NULL, featureset[ffs(mask) - 1])) { + break; + } + } + if (featbitmap & mask) { + return true; + } + return false; +} + +static void x86_cpuid_get_feature(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + CPUX86State *env = &cpu->env; + bool value = true; + + if (!is_feature_set(name, env->cpuid_features, feature_name) && + !is_feature_set(name, env->cpuid_ext_features, ext_feature_name) && + !is_feature_set(name, env->cpuid_ext2_features, ext2_feature_name) && + !is_feature_set(name, env->cpuid_ext3_features, ext3_feature_name) && + !is_feature_set(name, env->cpuid_kvm_features, kvm_feature_name) && + !is_feature_set(name, env->cpuid_svm_features, svm_feature_name)) { + value = false; + } + + visit_type_bool(v, &value, name, errp); +} + +static void x86_cpuid_set_feature(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + CPUX86State *env = &cpu->env; + uint32_t mask = 0; + uint32_t *dst_features; + bool value; + + visit_type_bool(v, &value, name, errp); + if (error_is_set(errp)) { + return; + } + + if (lookup_feature(&mask, name, NULL, feature_name)) { + dst_features = &env->cpuid_features; + } else if (lookup_feature(&mask, name, NULL, ext_feature_name)) { + dst_features = &env->cpuid_ext_features; + } else if (lookup_feature(&mask, name, NULL, ext2_feature_name)) { + dst_features = &env->cpuid_ext2_features; + } else if (lookup_feature(&mask, name, NULL, ext3_feature_name)) { + dst_features = &env->cpuid_ext3_features; + } else if (lookup_feature(&mask, name, NULL, kvm_feature_name)) { + dst_features = &env->cpuid_kvm_features; + } else if (lookup_feature(&mask, name, NULL, svm_feature_name)) { + dst_features = &env->cpuid_svm_features; + } else { + error_set(errp, QERR_PROPERTY_NOT_FOUND, "", name); + return; + } + + if (value) { + *dst_features |= mask; + } else { + *dst_features &= ~mask; + } +} + +static void x86_register_cpuid_properties(Object *obj, const char **featureset) +{ + uint32_t mask; + + for (mask = 1; mask; mask <<= 1) { + if (featureset[ffs(mask) - 1]) { + char *feature_name, *save_ptr; + char buf[32]; + if (strlen(featureset[ffs(mask) - 1]) > sizeof(buf) - 1) { + abort(); + } + pstrcpy(buf, sizeof(buf), featureset[ffs(mask) - 1]); + feature_name = strtok_r(buf, "|", &save_ptr); + while (feature_name) { + object_property_add(obj, feature_name, "bool", + x86_cpuid_get_feature, + x86_cpuid_set_feature, NULL, NULL, NULL); + feature_name = strtok_r(NULL, "|", &save_ptr); + } + } + } +} + static void x86_cpuid_version_get_family(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { @@ -1801,6 +1898,12 @@ static void x86_cpu_initfn(Object *obj) object_property_add(obj, "tsc-frequency", "int", x86_cpuid_get_tsc_freq, x86_cpuid_set_tsc_freq, NULL, NULL, NULL); + x86_register_cpuid_properties(obj, feature_name); + x86_register_cpuid_properties(obj, ext_feature_name); + x86_register_cpuid_properties(obj, ext2_feature_name); + x86_register_cpuid_properties(obj, ext3_feature_name); + x86_register_cpuid_properties(obj, kvm_feature_name); + x86_register_cpuid_properties(obj, svm_feature_name); env->cpuid_apic_id = env->cpu_index;