qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: David Marchand <david.marchand@6wind.com>
To: qemu-devel@nongnu.org
Cc: kvm@vger.kernel.org, stefanha@gmail.com,
	claudio.fontana@huawei.com, armbru@redhat.com,
	arei.gonglei@huawei.com, pbonzini@redhat.com,
	jani.kokkonen@huawei.com, cam@cs.ualberta.ca
Subject: [Qemu-devel] [PATCH v4 12/14] contrib/ivshmem-*: various fixes
Date: Tue,  2 Sep 2014 17:25:30 +0200	[thread overview]
Message-ID: <1409671532-12706-13-git-send-email-david.marchand@6wind.com> (raw)
In-Reply-To: <1409671532-12706-1-git-send-email-david.marchand@6wind.com>

More fixes following Gonglei comments:
- add a missing \n in a debug message.
- add an explicit initialisation of sock_fd.
- fix a check on vector index.

Signed-off-by: David Marchand <david.marchand@6wind.com>
---
 contrib/ivshmem-client/ivshmem-client.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/ivshmem-client/ivshmem-client.c b/contrib/ivshmem-client/ivshmem-client.c
index e9a19ff..ad210c8 100644
--- a/contrib/ivshmem-client/ivshmem-client.c
+++ b/contrib/ivshmem-client/ivshmem-client.c
@@ -105,7 +105,7 @@ handle_server_msg(IvshmemClient *client)
     if (fd == -1) {
 
         if (peer == NULL || peer == &client->local) {
-            debug_log(client, "receive delete for invalid peer %ld", peer_id);
+            debug_log(client, "receive delete for invalid peer %ld\n", peer_id);
             return -1;
         }
 
@@ -155,6 +155,7 @@ ivshmem_client_init(IvshmemClient *client, const char *unix_sock_path,
     client->notif_cb = notif_cb;
     client->notif_arg = notif_arg;
     client->verbose = verbose;
+    client->sock_fd = -1;
 
     return 0;
 }
@@ -309,7 +310,7 @@ ivshmem_client_notify(const IvshmemClient *client,
     uint64_t kick;
     int fd;
 
-    if (vector > peer->vectors_count) {
+    if (vector >= peer->vectors_count) {
         debug_log(client, "invalid vector %u on peer %ld\n", vector, peer->id);
         return -1;
     }
-- 
1.7.10.4

  parent reply	other threads:[~2014-09-02 15:26 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-02 15:25 [Qemu-devel] [PATCH v4 00/14] ivshmem: update documentation, add client/server tools David Marchand
2014-09-02 15:25 ` [Qemu-devel] [PATCH v4 01/14] contrib: add ivshmem client and server David Marchand
2014-09-02 20:20   ` Eric Blake
2014-09-02 15:25 ` [Qemu-devel] [PATCH v4 02/14] docs: update ivshmem device spec David Marchand
2014-09-02 20:24   ` Eric Blake
2014-09-02 15:25 ` [Qemu-devel] [PATCH v4 03/14] contrib/ivshmem-*: comply with QEMU coding style David Marchand
2014-09-02 15:25 ` [Qemu-devel] [PATCH v4 04/14] contrib/ivshmem-*: reuse qemu/queue.h David Marchand
2014-09-02 15:25 ` [Qemu-devel] [PATCH v4 05/14] contrib/ivshmem-*: switch to QEMU headers David Marchand
2014-09-02 20:28   ` Eric Blake
2014-09-02 15:25 ` [Qemu-devel] [PATCH v4 06/14] contrib/ivshmem-server: set client sockets as non blocking David Marchand
2014-09-02 15:25 ` [Qemu-devel] [PATCH v4 07/14] contrib/ivshmem-*: add missing const and static attrs David Marchand
2014-09-02 15:25 ` [Qemu-devel] [PATCH v4 08/14] contrib/ivshmem-*: plug client and server in QEMU top Makefile David Marchand
2014-09-02 15:25 ` [Qemu-devel] [PATCH v4 09/14] contrib/ivshmem-*: switch to g_malloc0/g_free David Marchand
2014-09-02 15:25 ` [Qemu-devel] [PATCH v4 10/14] contrib/ivshmem-server: fix mem leak on error David Marchand
2014-09-02 15:25 ` [Qemu-devel] [PATCH v4 11/14] contrib/ivshmem-*: rework error handling David Marchand
2014-09-02 15:25 ` David Marchand [this message]
2014-09-02 15:25 ` [Qemu-devel] [PATCH v4 13/14] contrib/ivshmem-server: align server default parameter values David Marchand
2014-09-02 15:25 ` [Qemu-devel] [PATCH v4 14/14] ivshmem: add check on protocol version in QEMU David Marchand
2014-09-02 20:31 ` [Qemu-devel] [PATCH v4 00/14] ivshmem: update documentation, add client/server tools Eric Blake
2014-09-03 13:01   ` David Marchand
2014-09-03 14:47     ` Eric Blake

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=1409671532-12706-13-git-send-email-david.marchand@6wind.com \
    --to=david.marchand@6wind.com \
    --cc=arei.gonglei@huawei.com \
    --cc=armbru@redhat.com \
    --cc=cam@cs.ualberta.ca \
    --cc=claudio.fontana@huawei.com \
    --cc=jani.kokkonen@huawei.com \
    --cc=kvm@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@gmail.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).