From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44363)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <andrey@xdel.ru>) id 1XP6ib-0002hV-LB
	for qemu-devel@nongnu.org; Wed, 03 Sep 2014 05:19:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <andrey@xdel.ru>) id 1XP6ia-0001l1-Rh
	for qemu-devel@nongnu.org; Wed, 03 Sep 2014 05:19:09 -0400
Received: from mail-oi0-x235.google.com ([2607:f8b0:4003:c06::235]:47591)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <andrey@xdel.ru>) id 1XP6iZ-0001kq-Uh
	for qemu-devel@nongnu.org; Wed, 03 Sep 2014 05:19:08 -0400
Received: by mail-oi0-f53.google.com with SMTP id x69so208331oia.12
	for <qemu-devel@nongnu.org>; Wed, 03 Sep 2014 02:19:07 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <20140903090712.GA6792@redhat.com>
References: <CABYiri-SXNaGYgr+7ZeSRGRxihH=WupGLveyiQs-hcMsX7UO8Q@mail.gmail.com>
	<20140902210315.GA25153@redhat.com>
	<CABYiri94FP1zupnLkVnt+-ASC+WBKb+DxyyE6piooBqEDDzePw@mail.gmail.com>
	<20140902215125.GC25231@redhat.com>
	<CABYiri97rj1_EOav6+8=D4QF9QZMDt7+ZdCgr9qhFgPNu7eW6g@mail.gmail.com>
	<CABYiri_yXV1gUfEbPaZ-FEHA3XsD2Ft0Uy=8TXfTRFC1GDnzjQ@mail.gmail.com>
	<20140903061015.GA5449@redhat.com>
	<CABYiri_PUoHZkLwCS234DEK+JnTtbdb81aFM3H54NsvhS7++YQ@mail.gmail.com>
	<20140903081302.GC6187@redhat.com>
	<CABYiri8zR1nT=TsNLgjYA4u+FWPvSRO+GE3fDfx=UxeeJ5B+Tw@mail.gmail.com>
	<20140903090712.GA6792@redhat.com>
From: Andrey Korolyov <andrey@xdel.ru>
Date: Wed, 3 Sep 2014 13:18:47 +0400
Message-ID: <CABYiri8nNKfTgyJTDkPnXZO7BUVX3_JmBMKLArr_M0CcqdJ0ew@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [Qemu-stable] Patch Round-up for stable 2.1.1,
	freeze on 2014-09-03
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: ehabkost@redhat.com, "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>, Stefan Hajnoczi <stefanha@gmail.com>, knut.omang@oracle.com, qemu-stable@nongnu.org, Michael Roth <mdroth@linux.vnet.ibm.com>, Michael Tokarev <mjt@tls.msk.ru>, Gerd Hoffmann <kraxel@redhat.com>, "J. Kiszka" <jan.kiszka@siemens.com>, chen.fan.fnst@cn.fujitsu.com, Paolo Bonzini <pbonzini@redhat.com>, sebastian.tanase@openwide.fr, zhang.zhanghailiang@huawei.com

>
> OK so my patch fixes initialization likely by luck.
>
>> with crash still in place.
>
> Hmm so something is still wrong with the userspace path.
> Could you please apply this debugging patch on top of
> all the stack that is now working for you, and see if
> assert still surfaces?
>
>
> diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
> index 1fe18c7..a8f8826 100644
> --- a/hw/net/vhost_net.c
> +++ b/hw/net/vhost_net.c
> @@ -314,7 +314,10 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
>      }
>
>      for (i = 0; i < total_queues; i++) {
> -        r = vhost_net_start_one(get_vhost_net(ncs[i].peer), dev);
> +        if (i > 0)
> +            r = -11;
> +        else
> +            r = vhost_net_start_one(get_vhost_net(ncs[i].peer), dev);
>
>          if (r < 0) {
>              goto err_start;
>

Yes, with Jason`s patch on the top and this one both acceleration and
re-initialization after reboot are broken, assert firing up again.
Will check if vhost_net: cleanup recovery works as intended and reply
to patch` thread.