qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marcel Apfelbaum" <marcel@redhat.com>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Yuanhan Liu" <yuanhan.liu@linux.intel.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=
	<marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PULL 04/15] vhost-user-test: support VHOST_USER_SET_VRING_ENABLE
Date: Thu, 19 Nov 2015 15:36:09 +0200	[thread overview]
Message-ID: <1447939696-28930-5-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1447939696-28930-1-git-send-email-mst@redhat.com>

vhost-user-test is broken now: it assumes
QEMU sends RESET_OWNER, and we stopped doing that.
Wait for ENABLE_RING with 0 instead.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tests/vhost-user-test.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 01cfc7e..022223b 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -70,6 +70,7 @@ typedef enum VhostUserRequest {
     VHOST_USER_SET_VRING_ERR = 14,
     VHOST_USER_GET_PROTOCOL_FEATURES = 15,
     VHOST_USER_SET_PROTOCOL_FEATURES = 16,
+    VHOST_USER_SET_VRING_ENABLE = 18,
     VHOST_USER_MAX
 } VhostUserRequest;
 
@@ -315,8 +316,10 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
         g_cond_signal(&s->data_cond);
         break;
 
-    case VHOST_USER_RESET_OWNER:
-        s->fds_num = 0;
+    case VHOST_USER_SET_VRING_ENABLE:
+        if (!msg.payload.state.num) {
+            s->fds_num = 0;
+        }
         break;
 
     default:
-- 
MST

  parent reply	other threads:[~2015-11-19 13:36 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-19 13:35 [Qemu-devel] [PULL 00/15] vhost, pc: fixes for 2.5 Michael S. Tsirkin
2015-11-19 13:35 ` [Qemu-devel] [PULL 01/15] vhost: let SET_VRING_ENABLE message depends on protocol feature Michael S. Tsirkin
2015-11-19 13:36 ` [Qemu-devel] [PULL 02/15] vhost: don't send RESET_OWNER at stop Michael S. Tsirkin
2015-11-19 13:36 ` [Qemu-devel] [PULL 03/15] vhost-user: update spec description Michael S. Tsirkin
2015-11-19 13:36 ` Michael S. Tsirkin [this message]
2015-11-19 13:36 ` [Qemu-devel] [PULL 05/15] vhost-user: print original request on error Michael S. Tsirkin
2015-11-19 13:36 ` [Qemu-devel] [PULL 06/15] vhost-user: start/stop all rings Michael S. Tsirkin
2015-11-19 13:36 ` [Qemu-devel] [PULL 07/15] q35: Check propery to determine if iommu is set Michael S. Tsirkin
2015-11-29 12:18   ` Marcel Apfelbaum
2015-11-29 18:22     ` Bandan Das
2015-11-30 11:38       ` Marcel Apfelbaum
2015-11-19 13:36 ` [Qemu-devel] [PULL 08/15] i440fx: print an error message if user tries to enable iommu Michael S. Tsirkin
2015-11-19 20:38   ` Bandan Das
2015-11-19 20:43     ` Michael S. Tsirkin
2015-11-19 20:55       ` Bandan Das
2015-11-19 20:56         ` Michael S. Tsirkin
2015-11-20  8:36         ` Michael S. Tsirkin
2015-11-19 21:00       ` Markus Armbruster
2015-11-20  9:43         ` Michael S. Tsirkin
2015-11-20 16:25           ` Bandan Das
2015-11-19 13:36 ` [Qemu-devel] [PULL 09/15] tests/vhost-user-bridge: implement logging of dirty pages Michael S. Tsirkin
2015-11-19 13:36 ` [Qemu-devel] [PULL 10/15] specs/vhost-user: fix spec to match reality Michael S. Tsirkin
2015-11-19 13:36 ` [Qemu-devel] [PULL 11/15] vhost-user: ignore qemu-only features Michael S. Tsirkin
2015-11-19 13:36 ` [Qemu-devel] [PULL 12/15] vhost-user: fix log size Michael S. Tsirkin
2015-11-19 13:36 ` [Qemu-devel] [PULL 13/15] acpi: fix buffer overrun on migration Michael S. Tsirkin
2015-11-19 13:36 ` [Qemu-devel] [PULL 14/15] tests: re-enable vhost-user-test Michael S. Tsirkin
2015-11-19 13:36 ` [Qemu-devel] [PULL 15/15] exec: silence hugetlbfs warning under qtest Michael S. Tsirkin
2015-11-19 17:54 ` [Qemu-devel] [PULL 00/15] vhost, pc: fixes for 2.5 Peter Maydell
2015-11-26 11:26 ` Peter Maydell
2015-11-26 16:19   ` Michael S. Tsirkin
2015-11-26 16:24     ` Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1447939696-28930-5-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=marcel@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=yuanhan.liu@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).