Re: [PATCH v6 04/22] vhost: move protocol_features to vhost_user

["Michael S. Tsirkin" <mst@redhat.com>]

On Fri, May 22, 2026 at 03:31:07PM +0300, Vladimir Sementsov-Ogievskiy wrote:
> On 20.04.26 23:03, Vladimir Sementsov-Ogievskiy wrote:
> > As comment says: it's only for vhost-user. So, let's move it
> > to corresponding vhost backend realization.
> > 
> > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
> > ---
> >   backends/cryptodev-vhost.c     |  1 -
> >   hw/block/vhost-user-blk.c      |  6 ++----
> >   hw/net/vhost_net.c             |  2 --
> >   hw/virtio/meson.build          |  3 +++
> >   hw/virtio/vhost-user-stub.c    |  6 ++++++
> >   hw/virtio/vhost-user.c         | 36 +++++++++++++++++++++++++++-------
> >   hw/virtio/virtio-qmp.c         |  6 ++++--
> >   include/hw/virtio/vhost-user.h |  4 ++++
> >   include/hw/virtio/vhost.h      |  8 --------
> >   9 files changed, 48 insertions(+), 24 deletions(-)
> >   create mode 100644 hw/virtio/vhost-user-stub.c
> > 
> 
> [..]
> 
> > diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
> > index 415e359e9fc..adc3a4f748a 100644
> > --- a/hw/virtio/meson.build
> > +++ b/hw/virtio/meson.build
> > @@ -43,6 +43,8 @@ if have_vhost
> >                            if_true: files('vhost-user-input-pci.c'))
> >       system_virtio_ss.add(when: ['CONFIG_VIRTIO_PCI', 'CONFIG_VHOST_USER_SPI'],
> >                            if_true: files('vhost-user-spi-pci.c'))
> 
> Small conflict, when applying to current master, as in master there is now
> one more entry after CONFIG_VHOST_USER_SPI:
> 
>    system_virtio_ss.add(when: ['CONFIG_VIRTIO_PCI', 'CONFIG_VHOST_USER_RTC'],
>                         if_true: files('vhost-user-rtc-pci.c'))
> 
> so, "else" should go after this new CONFIG_VHOST_USER_RTC entry.
> 
> 
> Let me know, if resend needed.
> 
> > +  else
> > +    system_virtio_ss.add(files('vhost-user-stub.c'))
> >     endif
> >     if have_vhost_vdpa
> >       system_virtio_ss.add(files('vhost-vdpa.c'))
> > @@ -91,6 +93,7 @@ system_virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss)
> >   system_ss.add_all(when: 'CONFIG_VIRTIO', if_true: system_virtio_ss)
> >   stub_ss.add(files('vhost-stub.c'))
> > +stub_ss.add(files('vhost-user-stub.c'))
> >   stub_ss.add(files('virtio-stub.c'))
> >   stub_ss.add(files('virtio-md-stubs.c'))


I'm confused why would we add vhost-user-stub.c twice at all.


> 
> 
> -- 
> Best regards,
> Vladimir