[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 21/51] ivshmem: simplify a bit the code
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PULL v3 21/51] ivshmem: simplify a bit the code |
Date: |
Tue, 13 Oct 2015 16:25:48 +0200 |
From: Marc-André Lureau <address@hidden>
Use some more explicit variables to simplify the code.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Claudio Fontana <address@hidden>
---
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
- [Qemu-devel] [PULL v3 05/51] ivshmem: fix number of bytes to push to fifo, (continued)
- [Qemu-devel] [PULL v3 05/51] ivshmem: fix number of bytes to push to fifo, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 06/51] ivshmem: factor out the incoming fifo handling, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 08/51] ivshmem: remove superflous ivshmem_attr field, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 09/51] ivshmem: remove useless doorbell field, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 07/51] ivshmem: remove unnecessary dup(), marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 10/51] ivshmem: more qdev conversion, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 11/51] ivshmem: remove last exit(1), marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 15/51] ivshmem: remove useless ivshmem_update_irq() val argument, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 18/51] ivshmem: improve debug messages, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 17/51] ivshmem: remove max_peer field, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 21/51] ivshmem: simplify a bit the code,
marcandre . lureau <=
- [Qemu-devel] [PULL v3 23/51] ivshmem: use common is_power_of_2(), marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 22/51] ivshmem: use common return, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 19/51] ivshmem: improve error handling, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 25/51] ivshmem: shmfd can be 0, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 20/51] ivshmem: print error on invalid peer id, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 26/51] ivshmem: check shm isn't already initialized, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 24/51] ivshmem: migrate with VMStateDescription, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 28/51] ivshmem: fix pci_ivshmem_exit(), marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 31/51] ivshmem: reset mask on device reset, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 35/51] ivshmem-server: use a uint16 for client ID, marcandre . lureau, 2015/10/13