[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/20] target-i386: Move setting defaults out of cpu
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 14/20] target-i386: Move setting defaults out of cpu_x86_parse_featurestr() |
Date: |
Tue, 15 Jan 2013 10:27:32 +0100 |
From: Igor Mammedov <address@hidden>
No functional change, needed for simplifying conversion to properties.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
target-i386/cpu.c | 9 ++++-----
1 Datei geändert, 4 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 9a48e3f..e75b293 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1343,15 +1343,11 @@ static int cpu_x86_parse_featurestr(x86_def_t
*x86_cpu_def, char *features)
unsigned int i;
char *featurestr; /* Single 'key=value" string being parsed */
/* Features to be added */
- FeatureWordArray plus_features = {
- [FEAT_KVM] = kvm_default_features,
- };
+ FeatureWordArray plus_features = { 0 };
/* Features to be removed */
FeatureWordArray minus_features = { 0 };
uint32_t numvalue;
- add_flagname_to_bitmaps("hypervisor", plus_features);
-
featurestr = features ? strtok(features, ",") : NULL;
while (featurestr) {
@@ -1607,6 +1603,9 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
goto error;
}
+ def->kvm_features |= kvm_default_features;
+ def->ext_features |= CPUID_EXT_HYPERVISOR;
+
if (cpu_x86_parse_featurestr(def, features) < 0) {
goto error;
}
--
1.7.10.4
- Re: [Qemu-devel] [PATCH 06/20] xen: Simplify halting of first CPU, (continued)
[Qemu-devel] [PATCH 07/20] exec: Return CPUState from qemu_get_cpu(), Andreas Färber, 2013/01/15
[Qemu-devel] [PATCH 08/20] kvm: Add fake KVM constants to avoid #ifdefs on KVM-specific code, Andreas Färber, 2013/01/15
[Qemu-devel] [PATCH 11/20] target-i386: kvm_check_features_against_host(): Use feature_word_info, Andreas Färber, 2013/01/15
[Qemu-devel] [PATCH 13/20] target-i386: check/enforce: Check all feature words, Andreas Färber, 2013/01/15
[Qemu-devel] [PATCH 09/20] target-i386: Disable kvm_mmu by default, Andreas Färber, 2013/01/15
[Qemu-devel] [PATCH 04/20] cpu: Move cpu_index field to CPUState, Andreas Färber, 2013/01/15
[Qemu-devel] [PATCH 10/20] target-i386/cpu: Introduce FeatureWord typedefs, Andreas Färber, 2013/01/15
[Qemu-devel] [PATCH 12/20] target-i386/cpu.c: Add feature name array for ext4_features, Andreas Färber, 2013/01/15
[Qemu-devel] [PATCH 14/20] target-i386: Move setting defaults out of cpu_x86_parse_featurestr(),
Andreas Färber <=
[Qemu-devel] [PATCH 18/20] target-i386: Introduce hw_{local, global}_breakpoint_enabled(), Andreas Färber, 2013/01/15
[Qemu-devel] [PATCH 17/20] target-i386: Define DR7 bit field constants, Andreas Färber, 2013/01/15
[Qemu-devel] [PATCH 16/20] target-i386: Move kvm_check_features_against_host() check to realize time, Andreas Färber, 2013/01/15
[Qemu-devel] [PATCH 15/20] target-i386: cpu_x86_register() consolidate freeing resources, Andreas Färber, 2013/01/15
[Qemu-devel] [PATCH 20/20] target-i386: Use switch in check_hw_breakpoints(), Andreas Färber, 2013/01/15
[Qemu-devel] [PATCH 19/20] target-i386: Avoid goto in hw_breakpoint_insert(), Andreas Färber, 2013/01/15
Re: [Qemu-devel] [PULL] QOM CPUState patch queue 2013-01-15, Anthony Liguori, 2013/01/15