From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: Re: [PATCH] virtio_console: move early VQ enablement Date: Mon, 20 Oct 2014 17:05:08 +0300 Message-ID: <20141020140508.GA11004@redhat.com> References: <20141020133555.GA27111@redhat.com> <1413813529-11044-1-git-send-email-cornelia.huck@de.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1413813529-11044-1-git-send-email-cornelia.huck@de.ibm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: Cornelia Huck Cc: Thomas Graf , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org List-Id: virtualization@lists.linuxfoundation.org On Mon, Oct 20, 2014 at 03:58:49PM +0200, Cornelia Huck wrote: > Commit f5866db6 (virtio_console: enable VQs early) tried to make > sure that DRIVER_OK was set when virtio_console started using its > virtqueues. Doing this in add_port(), however, means that we try > to set DRIVER_OK again when when a port is dynamically added after > the probe function is done. > > Let's move virtio_device_ready() to the probe function just before > trying to use the virtqueues instead. This is fine as nothing can > fail inbetween. > > Reported-by: Thomas Graf > Reviewed-by: Michael S. Tsirkin > Signed-off-by: Cornelia Huck Thanks! Acked-by: Michael S. Tsirkin Tested-by: Michael S. Tsirkin > --- > drivers/char/virtio_console.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c > index bfa6400..cf7a561 100644 > --- a/drivers/char/virtio_console.c > +++ b/drivers/char/virtio_console.c > @@ -1449,8 +1449,6 @@ static int add_port(struct ports_device *portdev, u32 id) > spin_lock_init(&port->outvq_lock); > init_waitqueue_head(&port->waitqueue); > > - virtio_device_ready(portdev->vdev); > - > /* Fill the in_vq with buffers so the host can send us data. */ > nr_added_bufs = fill_queue(port->in_vq, &port->inbuf_lock); > if (!nr_added_bufs) { > @@ -2026,6 +2024,8 @@ static int virtcons_probe(struct virtio_device *vdev) > spin_lock_init(&portdev->ports_lock); > INIT_LIST_HEAD(&portdev->ports); > > + virtio_device_ready(portdev->vdev); > + > if (multiport) { > unsigned int nr_added_bufs; > > -- > 1.8.5.5