[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 22/50] ivshmem: use common return
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PULL v2 22/50] ivshmem: use common return |
Date: |
Mon, 12 Oct 2015 18:41:16 +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>
Reviewed-by: Claudio Fontana <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 c054e52..fbb6f40 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
- [Qemu-devel] [PULL v2 10/50] ivshmem: more qdev conversion, (continued)
- [Qemu-devel] [PULL v2 10/50] ivshmem: more qdev conversion, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 11/50] ivshmem: remove last exit(1), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 12/50] ivshmem: limit maximum number of peers to G_MAXUINT16, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 13/50] ivshmem: simplify around increase_dynamic_storage(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 14/50] ivshmem: allocate eventfds in resize_peers(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 16/50] ivshmem: initialize max_peer to -1, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 17/50] ivshmem: remove max_peer field, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 18/50] ivshmem: improve debug messages, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 20/50] ivshmem: print error on invalid peer id, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 21/50] ivshmem: simplify a bit the code, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 22/50] ivshmem: use common return,
marcandre . lureau <=
- [Qemu-devel] [PULL v2 23/50] ivshmem: use common is_power_of_2(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 26/50] ivshmem: check shm isn't already initialized, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 29/50] ivshmem: replace 'guest' for 'peer' appropriately, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 31/50] ivshmem: reset mask on device reset, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 33/50] ivshmem-client: check the number of vectors, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 32/50] contrib: add ivshmem client and server, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 34/50] ivshmem-server: use a uint16 for client ID, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 37/50] ivshmem: add check on protocol version in QEMU, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 38/50] contrib: remove unnecessary strdup(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 40/50] qtest: add qtest_add_abrt_handler(), marcandre . lureau, 2015/10/12