Re: [Qemu-devel] [PATCH 3/3] [x86] SYSENTER/SYSEXIT IA-32e implementation v3

[Anthony Liguori <anthony@codemonkey.ws>]

Alexander Graf wrote:
> On Intel CPUs, sysenter and sysexit are valid in 64-bit mode. This patch
> makes both 64-bit aware and enables them for Intel CPUs.
>
> Changes since v1: Add cpu save/load for 64-bit wide sysenter variables
>
> Signed-off-by: Alexander Graf <agraf@suse.de>
>
>
> Index: qemu/target-i386/machine.c
> ===================================================================
> --- qemu.orig/target-i386/machine.c
> +++ qemu/target-i386/machine.c
> @@ -88,9 +88,9 @@ void cpu_save(QEMUFile *f, void *opaque)
>      cpu_put_seg(f, &env->gdt);
>      cpu_put_seg(f, &env->idt);
>  
> -    qemu_put_be32s(f, &env->sysenter_cs);
> -    qemu_put_be32s(f, &env->sysenter_esp);
> -    qemu_put_be32s(f, &env->sysenter_eip);
> +    qemu_put_bels(f, &env->sysenter_cs);
> +    qemu_put_bels(f, &env->sysenter_esp);
> +    qemu_put_bels(f, &env->sysenter_eip);

What exactly is be1s?  Don't you mean be64s?

>  
>      qemu_put_betls(f, &env->cr[0]);
>      qemu_put_betls(f, &env->cr[2]);
> @@ -169,7 +169,7 @@ int cpu_load(QEMUFile *f, void *opaque,
>      int32_t a20_mask;
>  
>      if (version_id != 3 && version_id != 4 && version_id != 5
> -        && version_id != 6)
> +        && version_id != 6 && version_id != 7)
>          return -EINVAL;
>      for(i = 0; i < CPU_NB_REGS; i++)
>          qemu_get_betls(f, &env->regs[i]);
> @@ -244,8 +244,13 @@ int cpu_load(QEMUFile *f, void *opaque,
>      cpu_get_seg(f, &env->idt);
>  
>      qemu_get_be32s(f, &env->sysenter_cs);
> -    qemu_get_be32s(f, &env->sysenter_esp);
> -    qemu_get_be32s(f, &env->sysenter_eip);
> +    if (version_id >= 7) {
> +        qemu_get_bels(f, &env->sysenter_esp);
> +        qemu_get_bels(f, &env->sysenter_eip);
>   

Same here.  This doesn't compile, does it?

> +    } else {
> +        qemu_get_be32s(f, &env->sysenter_esp);
> +        qemu_get_be32s(f, &env->sysenter_eip);
> +    }
>  
>      qemu_get_betls(f, &env->cr[0]);
>      qemu_get_betls(f, &env->cr[2]);

Regards,

Anthony Liguori