[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 21/46] ivshmem: use common return
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v3 21/46] ivshmem: use common return |
Date: |
Tue, 15 Sep 2015 18:07:38 +0200 |
From: Marc-André Lureau <address@hidden>
Both if branches return, move this out to common end.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/misc/ivshmem.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index a60454f..e391396 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -525,13 +525,12 @@ static void ivshmem_read(void *opaque, const uint8_t
*buf, int size)
if (incoming_posn >= 0 && s->vm_id == -1) {
/* receive our posn */
s->vm_id = incoming_posn;
- return;
} else {
/* otherwise an fd == -1 means an existing guest has gone away */
IVSHMEM_DPRINTF("posn %ld has gone away\n", incoming_posn);
close_guest_eventfds(s, incoming_posn);
- return;
}
+ return;
}
/* if the position is -1, then it's shared memory region fd */
--
2.4.3
- Re: [Qemu-devel] [PATCH v3 16/46] ivshmem: remove max_peer field, (continued)
- [Qemu-devel] [PATCH v3 18/46] ivshmem: improve error, marcandre . lureau, 2015/09/15
- [Qemu-devel] [PATCH v3 17/46] ivshmem: improve debug messages, marcandre . lureau, 2015/09/15
- [Qemu-devel] [PATCH v3 20/46] ivshmem: simplify a bit the code, marcandre . lureau, 2015/09/15
- [Qemu-devel] [PATCH v3 19/46] ivshmem: print error on invalid peer id, marcandre . lureau, 2015/09/15
- [Qemu-devel] [PATCH v3 21/46] ivshmem: use common return,
marcandre . lureau <=
- [Qemu-devel] [PATCH v3 22/46] ivshmem: use common is_power_of_2(), marcandre . lureau, 2015/09/15
- [Qemu-devel] [PATCH v3 23/46] ivshmem: migrate with VMStateDescription, marcandre . lureau, 2015/09/15
- [Qemu-devel] [PATCH v3 25/46] ivshmem: check shm isn't already initialized, marcandre . lureau, 2015/09/15
- [Qemu-devel] [PATCH v3 24/46] ivshmem: shmfd can be 0, marcandre . lureau, 2015/09/15
- [Qemu-devel] [PATCH v3 27/46] ivshmem: fix pci_ivshmem_exit(), marcandre . lureau, 2015/09/15
- [Qemu-devel] [PATCH v3 26/46] ivshmem: add device description, marcandre . lureau, 2015/09/15