From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyIPw-00021C-3E for qemu-devel@nongnu.org; Mon, 16 Nov 2015 06:57:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZyIPs-0000kk-Tm for qemu-devel@nongnu.org; Mon, 16 Nov 2015 06:57:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44797) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyIPs-0000kg-OE for qemu-devel@nongnu.org; Mon, 16 Nov 2015 06:57:48 -0500 Date: Mon, 16 Nov 2015 13:57:45 +0200 From: "Michael S. Tsirkin" Message-ID: <1447675059-7277-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] vhost-user-test: don't rely on RESET_OWNER List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , =?us-ascii?B?PT9VVEYtOD9xP01hcmMtQW5kcj1DMz1BOT0yMEx1cmVhdT89?= , Yuanhan Liu , Paolo Bonzini 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 --- tests/vhost-user-test.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 431aa9f..3593803 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -321,7 +321,9 @@ static void chr_read(void *opaque, const uint8_t *buf, int size) break; case VHOST_USER_SET_VRING_ENABLE: - s->fds_num = 0; + if (!msg.payload.state.num) { + s->fds_num = 0; + } break; default: -- MST