[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 20/45] ivshmem: use common return
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 20/45] ivshmem: use common return |
Date: |
Tue, 28 Jul 2015 02:32:32 +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 84d8ff1..8fcdd60 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -526,13 +526,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
- [Qemu-devel] [PATCH v2 10/45] ivshmem: remove last exit(1), (continued)
- [Qemu-devel] [PATCH v2 10/45] ivshmem: remove last exit(1), Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 11/45] ivshmem: increase_dynamic_storage() improvements, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 12/45] ivshmem: remove useless ivshmem_update_irq() val argument, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 13/45] ivshmem: initialize max_peer to -1, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 14/45] ivshmem: remove max_peer field, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 15/45] ivshmem: improve debug messages, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 16/45] ivshmem: improve error, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 18/45] ivshmem: add a warning if eventfd value is 0, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 17/45] ivshmem: print error on invalid peer id, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 19/45] ivshmem: beautify a bit the code, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 20/45] ivshmem: use common return,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 21/45] ivshmem: use common is_power_of_2(), Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 22/45] ivshmem: migrate with VMStateDescription, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 23/45] ivshmem: shmfd can be 0, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 24/45] ivshmem: check shm isn't already initialized, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 25/45] ivshmem: add device description, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 26/45] ivshmem: fix pci_ivshmem_exit(), Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 27/45] ivshmem: replace 'guest' for 'peer' appropriately, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 28/45] ivshmem: error on too many eventfd received, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 29/45] ivshmem: reset mask on device reset, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 31/45] ivshmem-client: check the number of vectors, Marc-André Lureau, 2015/07/27