From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVR8c-0004sG-ED for qemu-devel@nongnu.org; Thu, 25 Apr 2013 14:43:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVR8b-0001qw-C1 for qemu-devel@nongnu.org; Thu, 25 Apr 2013 14:43:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56938) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVR8b-0001qn-33 for qemu-devel@nongnu.org; Thu, 25 Apr 2013 14:43:21 -0400 From: Eduardo Habkost Date: Thu, 25 Apr 2013 15:43:00 -0300 Message-Id: <1366915386-14728-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1366915386-14728-1-git-send-email-ehabkost@redhat.com> References: <1366915386-14728-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 1/7] target-i386: Introduce generic CPUID feature compat function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Introduce x86_cpu_compat_set_features(), that can be used to set/unset feature bits on specific CPU models for machine-type compatibility. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 26 ++++++++++++++++++++++++++ target-i386/cpu.h | 4 ++++ 2 files changed, 30 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 5bcb79c..a207474 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -970,6 +970,32 @@ static x86_def_t builtin_x86_defs[] = { }, }; +/** + * x86_cpu_compat_set_features: + * @cpu_model: CPU model name to be changed. If NULL, all CPU models are changed + * @w: Identifies the feature word to be changed. + * @feat_add: Feature bits to be added to feature word + * @feat_remove: Feature bits to be removed from feature word + * + * Change CPU model feature bits for compatibility. + * + * This function may be used by machine-type compatibility functions + * to enable or disable feature bits on specific CPU models. + */ +void x86_cpu_compat_set_features(const char *cpu_model, FeatureWord w, + uint32_t feat_add, uint32_t feat_remove) +{ + x86_def_t *def; + int i; + for (i = 0; i < ARRAY_SIZE(builtin_x86_defs); i++) { + def = &builtin_x86_defs[i]; + if (!cpu_model || !strcmp(cpu_model, def->name)) { + def->features[w] |= feat_add; + def->features[w] &= ~feat_remove; + } + } +} + #ifdef CONFIG_KVM static int cpu_x86_fill_model_id(char *str) { diff --git a/target-i386/cpu.h b/target-i386/cpu.h index aca78fc..60581e1 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1254,6 +1254,10 @@ void cpu_report_tpr_access(CPUX86State *env, TPRAccess access); void disable_kvm_pv_eoi(void); +void x86_cpu_compat_set_features(const char *cpu_model, FeatureWord w, + uint32_t feat_add, uint32_t feat_remove); + + /* Return name of 32-bit register, from a R_* constant */ const char *get_register_name_32(unsigned int reg); -- 1.8.1.4