From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32777) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgFR-0004xE-N9 for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:46:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZlgFO-0002HM-H5 for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:46:53 -0400 Received: from mail-pa0-x22e.google.com ([2607:f8b0:400e:c03::22e]:34233) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgFO-0002HA-Bx for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:46:50 -0400 Received: by padhy16 with SMTP id hy16so158265667pad.1 for ; Mon, 12 Oct 2015 09:46:49 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Mon, 12 Oct 2015 18:41:15 +0200 Message-Id: <1444668104-22955-22-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1444668104-22955-1-git-send-email-marcandre.lureau@redhat.com> References: <1444668104-22955-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL v2 21/50] ivshmem: simplify a bit the code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, drjones@redhat.com, claudio.fontana@huawei.com, stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com, cam@cs.ualberta.ca From: Marc-André Lureau Use some more explicit variables to simplify the code. Signed-off-by: Marc-André Lureau Reviewed-by: Claudio Fontana --- hw/misc/ivshmem.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 6ee4881..c054e52 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -488,9 +488,10 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size) { IVShmemState *s = opaque; int incoming_fd; - int guest_max_eventfd; + int new_eventfd; long incoming_posn; Error *err = NULL; + Peer *peer; if (!fifo_update_and_get(s, buf, size, &incoming_posn, sizeof(incoming_posn))) { @@ -517,6 +518,8 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size) } } + peer = &s->peers[incoming_posn]; + if (incoming_fd == -1) { /* if posn is positive and unseen before then this is our posn*/ if (incoming_posn >= 0 && s->vm_id == -1) { @@ -564,27 +567,24 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size) return; } - /* each guest has an array of eventfds, and we keep track of how many - * guests for each VM */ - guest_max_eventfd = s->peers[incoming_posn].nb_eventfds; + /* each peer has an associated array of eventfds, and we keep + * track of how many eventfds received so far */ + /* get a new eventfd: */ + new_eventfd = peer->nb_eventfds++; /* this is an eventfd for a particular guest VM */ IVSHMEM_DPRINTF("eventfds[%ld][%d] = %d\n", incoming_posn, - guest_max_eventfd, incoming_fd); - event_notifier_init_fd(&s->peers[incoming_posn].eventfds[guest_max_eventfd], - incoming_fd); - - /* increment count for particular guest */ - s->peers[incoming_posn].nb_eventfds++; + new_eventfd, incoming_fd); + event_notifier_init_fd(&peer->eventfds[new_eventfd], incoming_fd); if (incoming_posn == s->vm_id) { - s->eventfd_chr[guest_max_eventfd] = create_eventfd_chr_device(s, - &s->peers[s->vm_id].eventfds[guest_max_eventfd], - guest_max_eventfd); + s->eventfd_chr[new_eventfd] = create_eventfd_chr_device(s, + &s->peers[s->vm_id].eventfds[new_eventfd], + new_eventfd); } if (ivshmem_has_feature(s, IVSHMEM_IOEVENTFD)) { - ivshmem_add_eventfd(s, incoming_posn, guest_max_eventfd); + ivshmem_add_eventfd(s, incoming_posn, new_eventfd); } } -- 2.4.3