[PULL for v11.2 0/1] s390/vhost fix

[PULL for v11.2 0/1] s390/vhost fix

[Eric Farman]

The following changes since commit f71afb409a87c4ecd0f9d63a5963eb645dfab780:

  Merge tag 'pull-loongarch-20261105' of https://github.com/bibo-mao/qemu into staging (2026-11-05 07:24:53 -0800)

are available in the Git repository at:

  https://efarman@gitlab.com/efarman/qemu.git tags/s390x-20261109

for you to fetch changes up to 94289e7960008ceedd16ba366ddca986df739936:

  vhost: only use config notifier when exists/initialized (2026-11-09 08:14:45 -0500)

----------------------------------------------------------------
Fix vhost on s390x

----------------------------------------------------------------
Eric Farman (1):
  vhost: only use config notifier when exists/initialized

 hw/virtio/vhost.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
2.56.0

[PULL for v11.2 1/1] vhost: only use config notifier when exists/initialized

[Eric Farman]

Commit e3b12d0c55e4 ("util/event_notifier: more strict API") added an
assert for an uninitialized file descriptor in event_notifier_get_fd(),
but it presumes that such a thing always exists.

On s390x, where a config notifier does not exist, this is a breaking
change for any vhost-backed device such as virtio-net. To remedy this,
move the acquisition of the file descriptor within the guard against
vhost_set_config_call and expand the guard to ensure the notifier is
initialized before being used.

Fixes: e3b12d0c55e4 ("util/event_notifier: more strict API")
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Tested-by: Konstantin Shkolnyy <kshk@linux.ibm.com>
Link: https://lore.kernel.org/qemu-devel/20261103172732.837511-1-farman@linux.ibm.com
Signed-off-by: Eric Farman <farman@linux.ibm.com>
---
 hw/virtio/vhost.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index b25919c5c7..189ac54117 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -2119,8 +2119,9 @@ static void vhost_start_config_intr(struct vhost_dev *dev)
         virtio_config_get_guest_notifier(dev->vdev);
 
     assert(dev->vhost_ops);
-    int fd = event_notifier_get_fd(config_notifier);
-    if (dev->vhost_ops->vhost_set_config_call) {
+    if (dev->vhost_ops->vhost_set_config_call &&
+        event_notifier_initialized(config_notifier)) {
+        int fd = event_notifier_get_fd(config_notifier);
         r = dev->vhost_ops->vhost_set_config_call(dev, fd);
         if (!r) {
             event_notifier_set(config_notifier);
-- 
2.56.0

Re: [PULL for v11.2 0/1] s390/vhost fix

[Richard Henderson]

On 11/9/26 06:43, Eric Farman wrote:
> The following changes since commit f71afb409a87c4ecd0f9d63a5963eb645dfab780:
> 
>    Merge tag 'pull-loongarch-20261105' ofhttps://github.com/bibo-mao/qemu into staging (2026-11-05 07:24:53 -0800)
> 
> are available in the Git repository at:
> 
>    https://efarman@gitlab.com/efarman/qemu.git tags/s390x-20261109
> 
> for you to fetch changes up to 94289e7960008ceedd16ba366ddca986df739936:
> 
>    vhost: only use config notifier when exists/initialized (2026-11-09 08:14:45 -0500)
> 
> ----------------------------------------------------------------
> Fix vhost on s390x

Applied, thanks.

r~