From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: Re: [PATCHv3 3/4] kvm: convert bus to slots_lock Date: Mon, 29 Jun 2009 14:04:18 -0300 Message-ID: <20090629170418.GA17937@amt.cnet> References: <20090629120911.GD21273@redhat.com> <20090629155031.GA16444@amt.cnet> <20090629163851.GD22029@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Gregory Haskins , avi@redhat.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, paulmck@linux.vnet.ibm.com, markmc@redhat.com To: "Michael S. Tsirkin" Return-path: Received: from mx2.redhat.com ([66.187.237.31]:55374 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752276AbZF2REi (ORCPT ); Mon, 29 Jun 2009 13:04:38 -0400 Content-Disposition: inline In-Reply-To: <20090629163851.GD22029@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On Mon, Jun 29, 2009 at 07:38:51PM +0300, Michael S. Tsirkin wrote: > On Mon, Jun 29, 2009 at 12:50:31PM -0300, Marcelo Tosatti wrote: > > > diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c > > > index 148c52a..1851aec 100644 > > > --- a/arch/x86/kvm/i8259.c > > > +++ b/arch/x86/kvm/i8259.c > > > @@ -548,6 +548,6 @@ struct kvm_pic *kvm_create_pic(struct kvm *kvm) > > > * Initialize PIO device > > > */ > > > kvm_iodevice_init(&s->dev, &picdev_ops); > > > - kvm_io_bus_register_dev(&kvm->pio_bus, &s->dev); > > > + kvm_io_bus_register_dev(kvm, &kvm->pio_bus, &s->dev); > > > return s; > > > > case KVM_CREATE_PIT2: > > create_pit: > > mutex_lock(&kvm->lock); > > kvm_io_bus_register_dev > > down_write(slots_lock); > > > > But the order is slots_lock -> kvm->lock. > > > > (you might want to update the comment on top of kvm_main.c to > > reflect that). > > Good catch. I think it's easiest to replace kvm->lock by slots_lock > here as well. Does something like the following make sense? > If yes I'll roll it up in the series. Looks good. Also please update the comment on top of kvm_main.c.