On Tue, Oct 13, 2009 at 03:19:08PM -0300, Marcelo Tosatti wrote:
> On Tue, Oct 13, 2009 at 02:17:19PM +0200, Gleb Natapov wrote:
> > Otherwise some cpus may start executing code before others
> > are fully initialized.
> >
> > Signed-off-by: Gleb Natapov <[email protected]>
> > ---
> > qemu-kvm.c | 26 ++++++++++++--------------
> > 1 files changed, 12 insertions(+), 14 deletions(-)
> >
> > diff --git a/qemu-kvm.c b/qemu-kvm.c
> > index 62ca050..3765818 100644
> > --- a/qemu-kvm.c
> > +++ b/qemu-kvm.c
> > @@ -1954,18 +1954,6 @@ static void process_irqchip_events(CPUState *env)
> >
> > static int kvm_main_loop_cpu(CPUState *env)
> > {
> > - setup_kernel_sigmask(env);
> > -
> > - pthread_mutex_lock(&qemu_mutex);
> > -
> > - kvm_arch_init_vcpu(env);
> > -#ifdef TARGET_I386
> > - kvm_tpr_vcpu_start(env);
> > -#endif
> > -
> > - cpu_single_env = env;
> > - kvm_arch_load_regs(env);
> > -
> > while (1) {
> > int run_cpu = !is_cpu_stopped(env);
> > if (run_cpu && !kvm_irqchip_in_kernel(kvm_context)) {
> > @@ -2003,15 +1991,25 @@ static void *ap_main_loop(void *_env)
> > on_vcpu(env, kvm_arch_do_ioperm, data);
> > #endif
> >
> > - /* signal VCPU creation */
> > + setup_kernel_sigmask(env);
> > +
> > pthread_mutex_lock(&qemu_mutex);
> > + cpu_single_env = env;
> > +
> > + kvm_arch_init_vcpu(env);
> > +#ifdef TARGET_I386
> > + kvm_tpr_vcpu_start(env);
> > +#endif
> > +
> > + kvm_arch_load_regs(env);
> > +
> > + /* signal VCPU creation */
> > current_env->created = 1;
> > pthread_cond_signal(&qemu_vcpu_cond);
> >
> > /* and wait for machine initialization */
> > while (!qemu_system_ready)
> > qemu_cond_wait(&qemu_system_cond);
> > - pthread_mutex_unlock(&qemu_mutex);
>
> You don't set cpu_single_env after reacquiring
> qemu_mutex here (via qemu_cond_wait).
Hmm, as far as I can see it is not used any more until kvm_run call.
But may we should set it anyway.
--
Gleb.
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
