[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RESEND v4 10/18] target-i386: Loop-based copying and
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH RESEND v4 10/18] target-i386: Loop-based copying and setting/unsetting of feature words |
Date: |
Wed, 14 May 2014 16:30:02 -0300 |
Now that we have the feature word arrays, we don't need to manually copy
each array item, we can simply iterate through each feature word.
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 35 ++++++++++-------------------------
1 file changed, 10 insertions(+), 25 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index ccd05ad..816adc2 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1652,6 +1652,7 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char
*features,
{
X86CPU *cpu = X86_CPU(cs);
char *featurestr; /* Single 'key=value" string being parsed */
+ FeatureWord w;
/* Features to be added */
FeatureWordArray plus_features = { 0 };
/* Features to be removed */
@@ -1731,22 +1732,11 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char
*features,
}
featurestr = strtok(NULL, ",");
}
- env->features[FEAT_1_EDX] |= plus_features[FEAT_1_EDX];
- env->features[FEAT_1_ECX] |= plus_features[FEAT_1_ECX];
- env->features[FEAT_8000_0001_EDX] |= plus_features[FEAT_8000_0001_EDX];
- env->features[FEAT_8000_0001_ECX] |= plus_features[FEAT_8000_0001_ECX];
- env->features[FEAT_C000_0001_EDX] |= plus_features[FEAT_C000_0001_EDX];
- env->features[FEAT_KVM] |= plus_features[FEAT_KVM];
- env->features[FEAT_SVM] |= plus_features[FEAT_SVM];
- env->features[FEAT_7_0_EBX] |= plus_features[FEAT_7_0_EBX];
- env->features[FEAT_1_EDX] &= ~minus_features[FEAT_1_EDX];
- env->features[FEAT_1_ECX] &= ~minus_features[FEAT_1_ECX];
- env->features[FEAT_8000_0001_EDX] &= ~minus_features[FEAT_8000_0001_EDX];
- env->features[FEAT_8000_0001_ECX] &= ~minus_features[FEAT_8000_0001_ECX];
- env->features[FEAT_C000_0001_EDX] &= ~minus_features[FEAT_C000_0001_EDX];
- env->features[FEAT_KVM] &= ~minus_features[FEAT_KVM];
- env->features[FEAT_SVM] &= ~minus_features[FEAT_SVM];
- env->features[FEAT_7_0_EBX] &= ~minus_features[FEAT_7_0_EBX];
+
+ for (w = 0; w < FEATURE_WORDS; w++) {
+ env->features[w] |= plus_features[w];
+ env->features[w] &= ~minus_features[w];
+ }
out:
return;
@@ -1876,24 +1866,19 @@ static void x86_cpu_load_def(X86CPU *cpu,
X86CPUDefinition *def, Error **errp)
CPUX86State *env = &cpu->env;
const char *vendor;
char host_vendor[CPUID_VENDOR_SZ + 1];
+ FeatureWord w;
object_property_set_int(OBJECT(cpu), def->level, "level", errp);
object_property_set_int(OBJECT(cpu), def->family, "family", errp);
object_property_set_int(OBJECT(cpu), def->model, "model", errp);
object_property_set_int(OBJECT(cpu), def->stepping, "stepping", errp);
- env->features[FEAT_1_EDX] = def->features[FEAT_1_EDX];
- env->features[FEAT_1_ECX] = def->features[FEAT_1_ECX];
- env->features[FEAT_8000_0001_EDX] = def->features[FEAT_8000_0001_EDX];
- env->features[FEAT_8000_0001_ECX] = def->features[FEAT_8000_0001_ECX];
object_property_set_int(OBJECT(cpu), def->xlevel, "xlevel", errp);
- env->features[FEAT_KVM] = def->features[FEAT_KVM];
- env->features[FEAT_SVM] = def->features[FEAT_SVM];
- env->features[FEAT_C000_0001_EDX] = def->features[FEAT_C000_0001_EDX];
- env->features[FEAT_7_0_EBX] = def->features[FEAT_7_0_EBX];
env->cpuid_xlevel2 = def->xlevel2;
cpu->cache_info_passthrough = def->cache_info_passthrough;
-
object_property_set_str(OBJECT(cpu), def->model_id, "model-id", errp);
+ for (w = 0; w < FEATURE_WORDS; w++) {
+ env->features[w] = def->features[w];
+ }
/* Special cases not set in the X86CPUDefinition structs: */
if (kvm_enabled()) {
--
1.9.0
- [Qemu-devel] [PATCH RESEND v4 00/18] target-i386: CPU feature flag queue, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 03/18] target-i386: Merge feature filtering/checking functions, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 01/18] target-i386: kvm: Don't enable MONITOR by default on any CPU model, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 02/18] target-i386: Simplify reporting of unavailable features, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 06/18] target-i386: Make TCG feature filtering more readable, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 05/18] target-i386: Isolate KVM-specific code on CPU feature filtering logic, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 04/18] target-i386: Pass FeatureWord argument to report_unavailable_features(), Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 07/18] target-i386: Filter FEAT_7_0_EBX TCG features too, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 08/18] target-i386: Filter KVM and 0xC0000001 features on TCG, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 09/18] target-i386: Define TCG_*_FEATURES earlier on cpu.c, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 10/18] target-i386: Loop-based copying and setting/unsetting of feature words,
Eduardo Habkost <=
- [Qemu-devel] [PATCH RESEND v4 11/18] target-i386: Loop-based feature word filtering in TCG mode, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 12/18] target-i386: Support check/enforce flags in TCG mode, too, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 13/18] target-i386: Support "-cpu host" in TCG mode, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 15/18] target-i386: Set migratable=yes by default, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 14/18] target-i386: Add "migratable" property to "host" CPU model, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 16/18] savevm: check vmsd for migratability status, Eduardo Habkost, 2014/05/14