Re: [PATCH 6/8] provide env->kvm_fd

[Glauber Costa <glommer@redhat.com>]

On Wed, Jul 08, 2009 at 04:32:37PM +0300, Gleb Natapov wrote:
> On Wed, Jul 08, 2009 at 09:09:00AM -0400, Glauber Costa wrote:
> > qemu upstream puts kvm information on env. Do that too, since it will
> > allow us to use CPUState in cpu-specific functions, instead of kvm-specific
> > types.
> > 
> > Signed-off-by: Glauber Costa <glommer@redhat.com>
> > ---
> >  kvm-all.c    |   12 ++++++++----
> >  libkvm-all.h |   12 ------------
> >  2 files changed, 8 insertions(+), 16 deletions(-)
> > 
> > diff --git a/kvm-all.c b/kvm-all.c
> > index 15bd429..b404f76 100644
> > --- a/kvm-all.c
> > +++ b/kvm-all.c
> > @@ -1519,21 +1519,25 @@ void kvm_disable_pit_creation(kvm_context_t kvm)
> >  	kvm->no_pit_creation = 1;
> >  }
> >  
> > -kvm_vcpu_context_t kvm_create_vcpu(kvm_context_t kvm, int id)
> > +static kvm_vcpu_context_t kvm_create_vcpu(kvm_context_t kvm, CPUState *env)
> >  {
> >  	long mmap_size;
> >  	int r;
> >  	kvm_vcpu_context_t vcpu_ctx = qemu_malloc(sizeof(struct kvm_vcpu_context));
> >  
> >  	vcpu_ctx->kvm = kvm;
> > -	vcpu_ctx->id = id;
> > +	vcpu_ctx->id = env->cpu_index;
> >  
> > -	r = ioctl(kvm->vm_fd, KVM_CREATE_VCPU, id);
> > +	r = ioctl(kvm->vm_fd, KVM_CREATE_VCPU, env->cpu_index);
> This just reverts all my work to separate apic_id from env->cpu_index.
> We want to bring good things from qemu-kvm to upstream not bad things
> from upstream to qemu-kvm :) If anything you should use env->cpuid_apic_id
> instead of env->cpu_index here.
cpuid_apic_id is fine.
my bad here.