X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=hw%2Fvirtio-net.c;h=d8a1629dc33b909fc4836b66387236b63e3d4a7d;hb=7ebc79037c5f426bfb08cc506670bf7dd3912430;hp=2f201ffc76149737b7c0eb70860cc319baa18f5f;hpb=ea299062eb66dba86b390b7e0f414f6a4e41f11f;p=qemu.git

diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index 2f201ffc7..d8a1629dc 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -384,7 +384,15 @@ static int virtio_net_has_buffers(VirtIONet *n, int bufsize)
         (n->mergeable_rx_bufs &&
          !virtqueue_avail_bytes(n->rx_vq, bufsize, 0))) {
         virtio_queue_set_notification(n->rx_vq, 1);
-        return 0;
+
+        /* To avoid a race condition where the guest has made some buffers
+         * available after the above check but before notification was
+         * enabled, check for available buffers again.
+         */
+        if (virtio_queue_empty(n->rx_vq) ||
+            (n->mergeable_rx_bufs &&
+             !virtqueue_avail_bytes(n->rx_vq, bufsize, 0)))
+            return 0;
     }
 
     virtio_queue_set_notification(n->rx_vq, 0);