On Tue, Jan 16, 2018 at 08:17:54AM +0000, Zhoujian (jay) wrote: > > -----Original Message----- > > From: Michael S. Tsirkin [mailto:m...@redhat.com] > > Sent: Tuesday, January 16, 2018 12:42 PM > > To: Zhoujian (jay) <jianjay.z...@huawei.com> > > Cc: qemu-devel@nongnu.org; imamm...@redhat.com; Huangweidong (C) > > <weidong.hu...@huawei.com>; wangxin (U) <wangxinxin.w...@huawei.com>; > > Gonglei > > (Arei) <arei.gong...@huawei.com>; Liuzhe (Ahriy, Euler) > > <liuzh...@huawei.com> > > Subject: Re: [PATCH v6 0/3] vhost: two fixes and used_memslots refactoring > > > > On Fri, Jan 12, 2018 at 10:47:56AM +0800, Jay Zhou wrote: > > > Jay Zhou (3): > > > vhost: remove assertion to prevent crash > > > vhost: fix memslot limit check > > > vhost: used_memslots refactoring > > > > This looks good to me, but needs to be rebased on top of vhost mem slot > > management refactoring by dgilbert is merged. Pls post the rebase, and I'll > > merge. > > Hi Michael, > I have tested but there're no conflicts, it is strange. > > The patches I applied locally in sequence: > > [PULL 21/33] vhost: Build temporary section list and deref after commit > [PULL 22/33] vhost: Move log_dirty check > [PULL 23/33] vhost: Simplify ring verification checks > [PULL 24/33] vhost: Merge sections added to temporary list > > And then, > > [PATCH v6 1/3] vhost: remove assertion to prevent crash > [PATCH v6 2/3] vhost: fix memslot limit check > [PATCH v6 3/3] vhost: used_memslots refactoring > > Could you point out which patches from Dave(or others) are conflict with mine? > > Regards, > Jay
So please simply rebase on top of master now. Thanks! > > > > Thanks! > > > > > > > > > hw/virtio/vhost-backend.c | 15 +++++++- > > > hw/virtio/vhost-user.c | 74 > > > +++++++++++++++++++++++++++-------- > > ---- > > > hw/virtio/vhost.c | 30 +++++++++------- > > > include/hw/virtio/vhost-backend.h | 6 ++-- > > > 4 files changed, 86 insertions(+), 39 deletions(-) > > > > > > -- > > > 1.8.3.1 > > >