From patchwork Mon Feb 11 16:35:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 219645 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 36EB82C02AA for ; Tue, 12 Feb 2013 04:03:58 +1100 (EST) Received: from localhost ([::1]:49291 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4wPi-0004v9-Bj for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2013 11:39:30 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4wPS-0004UO-8S for qemu-devel@nongnu.org; Mon, 11 Feb 2013 11:39:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U4wPL-0005PS-Ez for qemu-devel@nongnu.org; Mon, 11 Feb 2013 11:39:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49115) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4wPL-0005PC-8M for qemu-devel@nongnu.org; Mon, 11 Feb 2013 11:39:07 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1BGd6KT008850 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 11 Feb 2013 11:39:06 -0500 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r1BGctst028773; Mon, 11 Feb 2013 11:39:04 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 11 Feb 2013 17:35:08 +0100 Message-Id: <1360600511-25133-7-git-send-email-imammedo@redhat.com> In-Reply-To: <1360600511-25133-1-git-send-email-imammedo@redhat.com> References: <1360600511-25133-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Don@cloudswitch.com, afaerber@suse.de, ehabkost@redhat.com Subject: [Qemu-devel] [PATCH 6/9] target-i386: convert 'check' and 'enforce' to static 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 * additionally convert check_cpuid & enforce_cpuid to bool * make 'enforce' feature independent from 'check' Signed-off-by: Igor Mammedov --- target-i386/cpu.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 70 insertions(+), 7 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 0233985..bad0b12 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -592,6 +592,70 @@ PropertyInfo qdev_prop_hv_vapic = { .defval = _defval \ } +static bool check_cpuid; + +static void x86_cpuid_get_check(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + visit_type_bool(v, &check_cpuid, name, errp); +} + +static void x86_cpuid_set_check(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + bool value; + + visit_type_bool(v, &value, name, errp); + if (error_is_set(errp)) { + return; + } + check_cpuid = value; +} + +PropertyInfo qdev_prop_check = { + .name = "boolean", + .get = x86_cpuid_get_check, + .set = x86_cpuid_set_check, +}; +#define DEFINE_PROP_CHECK(_n, _defval) { \ + .name = _n, \ + .info = &qdev_prop_check, \ + .qtype = QTYPE_QBOOL, \ + .defval = _defval \ +} + +static bool enforce_cpuid; + +static void x86_cpuid_get_enforce(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + visit_type_bool(v, &enforce_cpuid, name, errp); +} + +static void x86_cpuid_set_enforce(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + bool value; + + visit_type_bool(v, &value, name, errp); + if (error_is_set(errp)) { + return; + } + enforce_cpuid = value; +} + +PropertyInfo qdev_prop_enforce = { + .name = "boolean", + .get = x86_cpuid_get_enforce, + .set = x86_cpuid_set_enforce, +}; +#define DEFINE_PROP_ENFORCE(_n, _defval) { \ + .name = _n, \ + .info = &qdev_prop_enforce, \ + .qtype = QTYPE_QBOOL, \ + .defval = _defval \ +} + static Property cpu_x86_properties[] = { DEFINE_PROP_FAMILY("family"), DEFINE_PROP_MODEL("model"), @@ -604,6 +668,8 @@ static Property cpu_x86_properties[] = { DEFINE_PROP_HV_SPINLOCKS("hv-spinlocks", HYPERV_SPINLOCK_NEVER_RETRY), DEFINE_PROP_HV_RELAXED("hv-relaxed", false), DEFINE_PROP_HV_VAPIC("hv-vapic", false), + DEFINE_PROP_CHECK("check", false), + DEFINE_PROP_ENFORCE("enforce", false), DEFINE_PROP_END_OF_LIST(), }; @@ -615,9 +681,6 @@ typedef struct model_features_t { FeatureWord feat_word; } model_features_t; -int check_cpuid = 0; -int enforce_cpuid = 0; - static uint32_t kvm_default_features = (1 << KVM_FEATURE_CLOCKSOURCE) | (1 << KVM_FEATURE_NOP_IO_DELAY) | (1 << KVM_FEATURE_CLOCKSOURCE2) | @@ -1530,9 +1593,9 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char *features, Error **errp) goto out; } } else if (!strcmp(featurestr, "check")) { - check_cpuid = 1; + object_property_parse(OBJECT(cpu), "on", featurestr, errp); } else if (!strcmp(featurestr, "enforce")) { - check_cpuid = enforce_cpuid = 1; + object_property_parse(OBJECT(cpu), "on", featurestr, errp); } else if (!strcmp(featurestr, "hv_relaxed")) { object_property_parse(OBJECT(cpu), "on", "hv-relaxed", errp); } else if (!strcmp(featurestr, "hv_vapic")) { @@ -2279,8 +2342,8 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) #ifdef CONFIG_KVM filter_features_for_kvm(cpu); #endif - if (check_cpuid && kvm_check_features_against_host(cpu) - && enforce_cpuid) { + if ((check_cpuid || enforce_cpuid) + && kvm_check_features_against_host(cpu) && enforce_cpuid) { error_setg(errp, "Host's CPU doesn't support requested features"); return; }