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>,
	=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=
	<marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PULL 11/15] vhost-user: unit test for new messages
Date: Fri, 2 Oct 2015 16:45:43 +0300	[thread overview]
Message-ID: <1443793405-15190-12-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1443793405-15190-1-git-send-email-mst@redhat.com>

Data is empty for now, but do make sure master
sets the new feature bit flag.

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

diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 0e04f06..87281b9 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -46,6 +46,8 @@
 
 #define VHOST_MEMORY_MAX_NREGIONS    8
 
+#define VHOST_USER_F_PROTOCOL_FEATURES 30
+
 typedef enum VhostUserRequest {
     VHOST_USER_NONE = 0,
     VHOST_USER_GET_FEATURES = 1,
@@ -62,6 +64,8 @@ typedef enum VhostUserRequest {
     VHOST_USER_SET_VRING_KICK = 12,
     VHOST_USER_SET_VRING_CALL = 13,
     VHOST_USER_SET_VRING_ERR = 14,
+    VHOST_USER_GET_PROTOCOL_FEATURES = 15,
+    VHOST_USER_SET_PROTOCOL_FEATURES = 16,
     VHOST_USER_MAX
 } VhostUserRequest;
 
@@ -214,6 +218,20 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
         /* send back features to qemu */
         msg.flags |= VHOST_USER_REPLY_MASK;
         msg.size = sizeof(m.u64);
+        msg.u64 = 0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES;
+        p = (uint8_t *) &msg;
+        qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size);
+        break;
+
+    case VHOST_USER_SET_FEATURES:
+	g_assert_cmpint(msg.u64 & (0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES),
+			!=, 0ULL);
+        break;
+
+    case VHOST_USER_GET_PROTOCOL_FEATURES:
+        /* send back features to qemu */
+        msg.flags |= VHOST_USER_REPLY_MASK;
+        msg.size = sizeof(m.u64);
         msg.u64 = 0;
         p = (uint8_t *) &msg;
         qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size);
-- 
MST

  parent reply	other threads:[~2015-10-02 13:45 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-02 13:44 [Qemu-devel] [PULL 00/15] virtio,pc features, fixes Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 01/15] virtio: introduce virtqueue_unmap_sg() Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 02/15] virtio: introduce virtqueue_discard() Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 03/15] virtio-net: correctly drop truncated packets Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 04/15] oslib: rework anonimous RAM allocation Michael S. Tsirkin
2015-10-02 14:18   ` Eric Blake
2015-10-02 13:45 ` [Qemu-devel] [PULL 05/15] oslib: allocate PROT_NONE pages on top of RAM Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 06/15] exec: " Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 07/15] pc: Add a comment explaining why pc_compat_2_4() doesn't exist Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 08/15] virtio: Notice when the system doesn't support MSIx at all Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 09/15] virtio-9p: migrate virtio subsections Michael S. Tsirkin
2015-10-02 14:05   ` Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 10/15] vhost-user-test: do not reinvent glib-compat.h Michael S. Tsirkin
2015-10-02 13:45 ` Michael S. Tsirkin [this message]
2015-10-02 13:45 ` [Qemu-devel] [PULL 12/15] memhp: extend address auto assignment to support gaps Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 13/15] pc: memhp: force gaps between DIMM's GPA Michael S. Tsirkin
2015-10-02 13:45 ` [Qemu-devel] [PULL 14/15] vhost-user-test: use tmpfs by default Michael S. Tsirkin
2015-10-05 22:39   ` Peter Maydell
2015-10-05 23:04     ` Michael S. Tsirkin
2015-10-05 23:17     ` Michael S. Tsirkin
2015-10-06  8:41       ` Peter Maydell
2015-10-06 11:07         ` Peter Maydell
2015-10-14 14:01       ` Marc-André Lureau
2015-10-02 13:46 ` [Qemu-devel] [PULL 15/15] vhost-user-test: fix predictable filename on tmpfs Michael S. Tsirkin
2015-10-02 14:06 ` [Qemu-devel] [PULL 00/15] virtio,pc features, fixes Michael S. Tsirkin
2015-10-02 16:06   ` Eric Blake
2015-10-02 16:27   ` Peter Maydell

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=1443793405-15190-12-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=marcel@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).