On Fri, Aug 10, 2012 at 01:22:22PM +0200, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <imamm...@redhat.com>
Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
> ---
> target-i386/cpu.c | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 783c6f4..a47cc12 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -745,8 +745,17 @@ static void x86_cpuid_set_xlevel(Object *obj, Visitor
> *v, void *opaque,
> const char *name, Error **errp)
> {
> X86CPU *cpu = X86_CPU(obj);
> + uint32_t value;
>
> - visit_type_uint32(v, &cpu->env.cpuid_xlevel, name, errp);
> + visit_type_uint32(v, &value, name, errp);
> + if (error_is_set(errp)) {
> + return;
> + }
> +
> + if (value < 0x80000000) {
> + value += 0x80000000;
> + }
> + cpu->env.cpuid_xlevel = value;
> }
>
> static char *x86_cpuid_get_vendor(Object *obj, Error **errp)
> @@ -981,9 +990,6 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t
> *x86_cpu_def,
> fprintf(stderr, "bad numerical value %s\n", val);
> goto error;
> }
> - if (numvalue < 0x80000000) {
> - numvalue += 0x80000000;
> - }
> x86_cpu_def->xlevel = numvalue;
> } else if (!strcmp(featurestr, "vendor")) {
> if (strlen(val) != 12) {
> --
> 1.7.11.2
>
--
Eduardo
