Leo Yan <leo....@linaro.org> writes: > Hi Michael, > > On Mon, Dec 25, 2023 at 11:06:35AM -0500, Michael S. Tsirkin wrote: >> On Mon, Nov 20, 2023 at 12:37:17PM +0800, Leo Yan wrote: >> > This series is to refactor vhost stub vhost-user-input. >> > >> > Since vhost input stub requires set_config() callback for communication >> > event configurations between the backend and the guest, patch 01 is a >> > preparison for support set_config() callback in vhost-user-base. >> > >> > The patch 02 is to add documentation for vhost-user-input. >> > >> > The patch 03 is to move virtio input stub from the input folder to the >> > virtio folder. >> >> Thanks! >> Now the release is out I'd like to apply this - can you please rebase on >> latest master and >> repost? > > Sure. But I found it's not this patch series causing merging conflict. > > Since my patch series is based on Alex's patch series "virtio: cleanup > vhost-user-generic and reduce c&p" [1], when applying Alex's patch > series on the master branch, I found the confliction with below commeits: > > 91208dd297 ("virtio: i2c: Check notifier helpers for VIRTIO_CONFIG_IRQ_IDX") > 298d4f892e ("vhost-user: fix the reconnect error") > > @Alex, could you rebase the patch set "virtio: cleanup > vhost-user-generic and reduce c&p" and then I will resend my patch set? > > Thanks, > Leo > > [1] > https://lore.kernel.org/qemu-devel/20231107180752.3458672-1-alex.ben...@linaro.org/ > >> > The patch 04 derives vhost-user-input from vhost-user-base. We reuse >> > the common code from vhhost-user-base as possible and the input stub is >> > simplized significantly. >> > >> > This patch set has been tested with the backend daemon: >> > >> > # ./build/contrib/vhost-user-input/vhost-user-input \ >> > -p /dev/input/event20 -s /tmp/input.sock >> > >> > The series is based on "[PATCH v8 0/7] virtio: cleanup >> > vhost-user-generic and reduce c&p" which introduces vhost-user-base. >> > Based-on: <20231107180752.3458672-1-alex.ben...@linaro.org>
I'll fix up and include this series in my next posting. Hopefully by the end of this week. -- Alex Bennée Virtualisation Tech Lead @ Linaro