From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Richard Henderson" <rth@twiddle.net>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
=?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Subject: [Qemu-devel] [PULL 05/24] target-i386: Remove x86_cpu_compat_set_features()
Date: Thu, 13 Aug 2015 15:14:52 +0300 [thread overview]
Message-ID: <1439468033-6413-6-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1439468033-6413-1-git-send-email-mst@redhat.com>
From: Eduardo Habkost <ehabkost@redhat.com>
The function is not used by PC code anymore and can be removed.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
target-i386/cpu.h | 3 ---
target-i386/cpu.c | 26 --------------------------
2 files changed, 29 deletions(-)
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);
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);
--
MST
next prev parent reply other threads:[~2015-08-13 12:14 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-13 12:14 [Qemu-devel] [PULL 00/24] virtio,pc,acpi fixes, cleanups Michael S. Tsirkin
2015-08-13 12:14 ` [Qemu-devel] [PULL 01/24] make: fix where dependency *.d are stored Michael S. Tsirkin
2015-08-13 12:14 ` [Qemu-devel] [PULL 02/24] make: load only required dependency files Michael S. Tsirkin
2015-08-13 12:14 ` [Qemu-devel] [PULL 03/24] piix: Document coreboot-specific RAM size config register Michael S. Tsirkin
2015-08-13 12:14 ` [Qemu-devel] [PULL 04/24] pc: Use PC_COMPAT_* for CPUID feature compatibility Michael S. Tsirkin
2015-08-13 12:14 ` Michael S. Tsirkin [this message]
2015-08-13 12:14 ` [Qemu-devel] [PULL 06/24] pc: Use error_abort when registering properties Michael S. Tsirkin
2015-08-13 12:14 ` [Qemu-devel] [PULL 07/24] pc: Rename pc_machine variables to pcms Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 08/24] pc: Move PCMachineClass, PCMachineState to qemu/typedefs.h Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 09/24] pc: Eliminate pc_common_machine_options() Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 10/24] pc: Eliminate pc_default_machine_options() Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 11/24] pc: Use PCMachineState for pc_cmos_init() argument Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 12/24] pc: Use PCMachineState for pc_memory_init() argument Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 13/24] pc: Move {above, below}_4g_mem_size variables to PCMachineState Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 14/24] pc: Use PCMachineState as pc_guest_info_init() argument Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 15/24] pc: Remove redundant arguments from *load_linux() Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 16/24] pc: Remove redundant arguments from pc_cmos_init() Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 17/24] pc: Remove redundant arguments from pc_memory_init() Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 18/24] pci: allow 0 address for PCI IO/MEM regions Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 19/24] virtio-net: remove useless codes Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 20/24] acpi: avoid potential uninitialized access to cpu_hp_io_base Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 21/24] smbios: extract x86 smbios building code into a function Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 22/24] smbios: remove dependency on x86 e820 tables Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 23/24] smbios: move smbios code into a common folder Michael S. Tsirkin
2015-08-13 12:15 ` [Qemu-devel] [PULL 24/24] MAINTAINERS: list smbios maintainers Michael S. Tsirkin
2015-08-13 16:41 ` [Qemu-devel] [PULL 00/24] virtio,pc,acpi fixes, cleanups Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439468033-6413-6-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=afaerber@suse.de \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).