On Thu, Dec 27, 2012 at 03:59:21PM +0100, Igor Mammedov wrote:
> No functional change, needed for simplifying conversion to properties.
>
> Signed-off-by: Igor Mammedov <imamm...@redhat.com>
> Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
To confirm that this specific submission is OK to me:
Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
> ---
> target-i386/cpu.c | 12 +++++++-----
> 1 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 99fd3f3..e534254 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -1264,7 +1264,7 @@ static int cpu_x86_parse_featurestr(x86_def_t
> *x86_cpu_def, char *features)
> /* Features to be added */
> uint32_t plus_features = 0, plus_ext_features = 0;
> uint32_t plus_ext2_features = 0, plus_ext3_features = 0;
> - uint32_t plus_kvm_features = kvm_default_features, plus_svm_features = 0;
> + uint32_t plus_kvm_features = 0, plus_svm_features = 0;
> uint32_t plus_7_0_ebx_features = 0;
> /* Features to be removed */
> uint32_t minus_features = 0, minus_ext_features = 0;
> @@ -1273,10 +1273,6 @@ static int cpu_x86_parse_featurestr(x86_def_t
> *x86_cpu_def, char *features)
> uint32_t minus_7_0_ebx_features = 0;
> uint32_t numvalue;
>
> - add_flagname_to_bitmaps("hypervisor", &plus_features,
> - &plus_ext_features, &plus_ext2_features, &plus_ext3_features,
> - &plus_kvm_features, &plus_svm_features, &plus_7_0_ebx_features);
> -
> featurestr = features ? strtok(features, ",") : NULL;
>
> while (featurestr) {
> @@ -1536,6 +1532,12 @@ int cpu_x86_register(X86CPU *cpu, const char
> *cpu_model)
> goto error;
> }
>
> + def->kvm_features |= kvm_default_features;
> + add_flagname_to_bitmaps("hypervisor", &def->features,
> + &def->ext_features, &def->ext2_features,
> + &def->ext3_features, &def->kvm_features,
> + &def->svm_features,
> &def->cpuid_7_0_ebx_features);
> +
> if (cpu_x86_parse_featurestr(def, features) < 0) {
> goto error;
> }
> --
> 1.7.1
>
--
Eduardo
