On 20.02.26 19:20, Michael S. Tsirkin wrote:
On Fri, Feb 06, 2026 at 12:52:38PM +0300, 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 <[email protected]>
breaks build:
https://gitlab.com/mstredhat/qemu/-/jobs/13201554836
builds/mstredhat/qemu/build/../hw/virtio/virtio-qmp.c:830:(.text+0xd60):
undefined reference to `vhost_user_qmp_status'
Suggest:
diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
index 6675b63ce6..047385df3d 100644
--- a/hw/virtio/meson.build
+++ b/hw/virtio/meson.build
@@ -45,13 +45,15 @@ 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'))
+ else
+ system_virtio_ss.add(files('vhost-user-stub.c'))
endif
if have_vhost_vdpa
system_virtio_ss.add(files('vhost-vdpa.c'))
system_virtio_ss.add(files('vhost-shadow-virtqueue.c'))
endif
else
- system_virtio_ss.add(files('vhost-stub.c'))
+ system_virtio_ss.add(files('vhost-stub.c', 'vhost-user-stub.c'))
endif
system_virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true:
files('vhost-user-vsock.c'))
system_virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng.c'))
diff --git a/hw/virtio/vhost-user-stub.c b/hw/virtio/vhost-user-stub.c
new file mode 100644
index 0000000000..45559788dd
--- /dev/null
+++ b/hw/virtio/vhost-user-stub.c
@@ -0,0 +1,6 @@
+#include "qemu/osdep.h"
+#include "hw/virtio/vhost-user.h"
+
+void vhost_user_qmp_status(struct vhost_dev *dev, VirtioStatus *status)
+{
+}
it fixes the problem: https://gitlab.com/vsementsov/qemu/-/pipelines/2340295574
here rebased on master branch:
https://gitlab.com/vsementsov/qemu/-/tree/up-vhost-user-blk-refactor
the only chnage is above fixup and the fact that
07 "virtio-ccw: virtio_ccw_set_guest_notifier(): fix failure path"
is already in master as 391c230f71fbf22284d
--
Best regards,
Vladimir
