From patchwork Fri Aug 7 19:55:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 505229 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C431514075F for ; Sat, 8 Aug 2015 05:56:55 +1000 (AEST) Received: from localhost ([::1]:50982 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNnl7-0000DR-PF for incoming@patchwork.ozlabs.org; Fri, 07 Aug 2015 15:56:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNnka-0007fV-QA for qemu-devel@nongnu.org; Fri, 07 Aug 2015 15:56:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZNnkX-0003ZP-1A for qemu-devel@nongnu.org; Fri, 07 Aug 2015 15:56:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35428) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNnkW-0003ZK-Ri for qemu-devel@nongnu.org; Fri, 07 Aug 2015 15:56:16 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 6E81D85544 for ; Fri, 7 Aug 2015 19:56:16 +0000 (UTC) Received: from localhost (ovpn-113-58.phx2.redhat.com [10.3.113.58]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t77JuFiQ016269; Fri, 7 Aug 2015 15:56:15 -0400 From: Eduardo Habkost To: "Michael S. Tsirkin" Date: Fri, 7 Aug 2015 16:55:43 -0300 Message-Id: <1438977359-29840-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1438977359-29840-1-git-send-email-ehabkost@redhat.com> References: <1438977359-29840-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH for-2.5 02/18] target-i386: Remove x86_cpu_compat_set_features() 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 The function is not used by PC code anymore and can be removed. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 26 -------------------------- target-i386/cpu.h | 3 --- 2 files changed, 29 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 7a779b1..cfb8aa7 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1392,32 +1392,6 @@ static X86CPUDefinition 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) -{ - X86CPUDefinition *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; - } - } -} - static uint32_t x86_cpu_get_supported_feature_word(FeatureWord w, bool migratable_only); diff --git a/target-i386/cpu.h b/target-i386/cpu.h index ead2832..74b674d 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1332,9 +1332,6 @@ void cpu_smm_update(X86CPU *cpu); void cpu_report_tpr_access(CPUX86State *env, TPRAccess access); -void x86_cpu_compat_set_features(const char *cpu_model, FeatureWord w, - uint32_t feat_add, uint32_t feat_remove); - void x86_cpu_compat_kvm_no_autoenable(FeatureWord w, uint32_t features); void x86_cpu_compat_kvm_no_autodisable(FeatureWord w, uint32_t features);