diff options
| author | Peter Maydell | 2017-10-16 11:22:39 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-10-16 11:22:39 +0200 |
| commit | 40a1e8ac2e10155b5df13a2508ac080b00cd7e23 (patch) | |
| tree | 891376c9ace90e648f1d78294e2840afb2d85bf8 /tests/vhost-user-bridge.c | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20171012'... (diff) | |
| parent | libvhost-user: Support VHOST_USER_SET_SLAVE_REQ_FD (diff) | |
| download | qemu-40a1e8ac2e10155b5df13a2508ac080b00cd7e23.tar.gz qemu-40a1e8ac2e10155b5df13a2508ac080b00cd7e23.tar.xz qemu-40a1e8ac2e10155b5df13a2508ac080b00cd7e23.zip | |
Merge remote-tracking branch 'remotes/elmarco/tags/vu-pull-request' into staging
# gpg: Signature made Thu 12 Oct 2017 21:52:28 BST
# gpg: using RSA key 0xDAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5
* remotes/elmarco/tags/vu-pull-request:
libvhost-user: Support VHOST_USER_SET_SLAVE_REQ_FD
libvhost-user: Update and fix feature and request lists
vhost-user-bridge: Only process received packets on started queues
libvhost-user: vu_queue_started
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/vhost-user-bridge.c')
| -rw-r--r-- | tests/vhost-user-bridge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c index f922cc75ae..d820033a72 100644 --- a/tests/vhost-user-bridge.c +++ b/tests/vhost-user-bridge.c @@ -277,6 +277,7 @@ vubr_backend_recv_cb(int sock, void *ctx) DPRINT(" hdrlen = %d\n", hdrlen); if (!vu_queue_enabled(dev, vq) || + !vu_queue_started(dev, vq) || !vu_queue_avail_bytes(dev, vq, hdrlen, 0)) { DPRINT("Got UDP packet, but no available descriptors on RX virtq.\n"); return; |