diff options
| author | David Marchand <david.marchand@6wind.com> | 2015-06-16 17:43:34 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2015-10-24 18:03:18 +0200 |
| commit | 5105b1d8c2d1ad4a25b8806e86c0f012936b2eed (patch) | |
| tree | 95dcbbebbf05b3b91be876b0355e76d9b94d7cc6 /contrib/ivshmem-server | |
| parent | 8c4ef202b901d25b88efc55398d4a76dfb2594de (diff) | |
ivshmem: add check on protocol version in QEMU
Send a protocol version as the first message from server, clients must
close communication if they don't support this protocol version. Older
QEMUs should be fine with this change in the protocol since they
overrides their own vm_id on reception of an id associated to no
eventfd.
Signed-off-by: David Marchand <david.marchand@6wind.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
[use fifo_update_and_get()]
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Diffstat (limited to 'contrib/ivshmem-server')
| -rw-r--r-- | contrib/ivshmem-server/ivshmem-server.c | 9 | ||||
| -rw-r--r-- | contrib/ivshmem-server/ivshmem-server.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/contrib/ivshmem-server/ivshmem-server.c b/contrib/ivshmem-server/ivshmem-server.c index 01c8920108..e8693dec3c 100644 --- a/contrib/ivshmem-server/ivshmem-server.c +++ b/contrib/ivshmem-server/ivshmem-server.c @@ -101,6 +101,15 @@ ivshmem_server_send_initial_info(IvshmemServer *server, IvshmemServerPeer *peer) { int ret; + /* send our protocol version first */ + ret = ivshmem_server_send_one_msg(peer->sock_fd, IVSHMEM_PROTOCOL_VERSION, + -1); + if (ret < 0) { + IVSHMEM_SERVER_DEBUG(server, "cannot send version: %s\n", + strerror(errno)); + return -1; + } + /* send the peer id to the client */ ret = ivshmem_server_send_one_msg(peer->sock_fd, peer->id, -1); if (ret < 0) { diff --git a/contrib/ivshmem-server/ivshmem-server.h b/contrib/ivshmem-server/ivshmem-server.h index 8261e86176..89c905fa63 100644 --- a/contrib/ivshmem-server/ivshmem-server.h +++ b/contrib/ivshmem-server/ivshmem-server.h @@ -33,6 +33,7 @@ #include "qemu/event_notifier.h" #include "qemu/queue.h" +#include "hw/misc/ivshmem.h" /** * Maximum number of notification vectors supported by the server |