Re: [patch 2/4] QEMU/KVM: save and load mp state

[Avi Kivity <avi@qumranet.com>]

Marcelo Tosatti wrote:
> Use the new ioctl's to save and restore the MP_STATE for all vcpu's.
>
> Fixes SMP migration.
>
> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
>
> Index: kvm-userspace.io/libkvm/libkvm.c
> ===================================================================
> --- kvm-userspace.io.orig/libkvm/libkvm.c
> +++ kvm-userspace.io/libkvm/libkvm.c
> @@ -776,6 +776,17 @@ int kvm_set_sregs(kvm_context_t kvm, int
>      return ioctl(kvm->vcpu_fd[vcpu], KVM_SET_SREGS, sregs);
>  }
>  
> +int kvm_get_mpstate(kvm_context_t kvm, int vcpu, int *mpstate)
> +{
> +    return ioctl(kvm->vcpu_fd[vcpu], KVM_GET_MP_STATE, mpstate);
> +}
> +
> +int kvm_set_mpstate(kvm_context_t kvm, int vcpu, int *mpstate)
> +{
> +    return ioctl(kvm->vcpu_fd[vcpu], KVM_SET_MP_STATE, mpstate);
> +}
> +
>   

I missed the kernel part of this.  The functions need KVM_CAP 
compile-time and run-time protection.  Please separate the libkvm and 
qemu parts.

>  
>  CPUX86State *cpu_x86_init(const char *cpu_model);
> Index: kvm-userspace.io/qemu/vl.c
> ===================================================================
> --- kvm-userspace.io.orig/qemu/vl.c
> +++ kvm-userspace.io/qemu/vl.c
> @@ -6655,8 +6655,10 @@ void cpu_save(QEMUFile *f, void *opaque)
>      uint32_t hflags;
>      int i;
>  
> -    if (kvm_enabled())
> +    if (kvm_enabled()) {
>          kvm_save_registers(env);
> +        kvm_save_mpstate(env);
> +    }
>   

Perhaps fold kvm_save_mpstate() into kvm_save_registers()?  We can 
regard the mp state as a hidden register.

>  
>      for(i = 0; i < CPU_NB_REGS; i++)
>          qemu_put_betls(f, &env->regs[i]);
> @@ -6748,6 +6750,7 @@ void cpu_save(QEMUFile *f, void *opaque)
>              qemu_put_be32s(f, &env->kvm_interrupt_bitmap[i]);
>          }
>          qemu_put_be64s(f, &env->tsc);
> +        qemu_put_be32s(f, &env->mp_state);
>      }
>  }
>  

Bump the format version number and introduce compatibility code, please.


-- 
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Register now and save $200. Hurry, offer ends at 11:59 p.m., 
Monday, April 7! Use priority code J8TLD2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone