[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 07/50] ivshmem: remove unnecessary dup()
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PULL v2 07/50] ivshmem: remove unnecessary dup() |
Date: |
Mon, 12 Oct 2015 18:41:01 +0200 |
From: Marc-André Lureau <address@hidden>
qemu_chr_fe_get_msgfd() transfers ownership, there is no need to dup the
fd.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Claudio Fontana <address@hidden>
---
hw/misc/ivshmem.c | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index dd15f0e..fbeb731 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -480,7 +480,7 @@ static bool fifo_update_and_get(IVShmemState *s, const
uint8_t *buf, int size,
static void ivshmem_read(void *opaque, const uint8_t *buf, int size)
{
IVShmemState *s = opaque;
- int incoming_fd, tmp_fd;
+ int incoming_fd;
int guest_max_eventfd;
long incoming_posn;
@@ -495,21 +495,21 @@ static void ivshmem_read(void *opaque, const uint8_t
*buf, int size)
}
/* pick off s->server_chr->msgfd and store it, posn should accompany msg */
- tmp_fd = qemu_chr_fe_get_msgfd(s->server_chr);
- IVSHMEM_DPRINTF("posn is %ld, fd is %d\n", incoming_posn, tmp_fd);
+ incoming_fd = qemu_chr_fe_get_msgfd(s->server_chr);
+ IVSHMEM_DPRINTF("posn is %ld, fd is %d\n", incoming_posn, incoming_fd);
/* make sure we have enough space for this guest */
if (incoming_posn >= s->nb_peers) {
if (increase_dynamic_storage(s, incoming_posn) < 0) {
error_report("increase_dynamic_storage() failed");
- if (tmp_fd != -1) {
- close(tmp_fd);
+ if (incoming_fd != -1) {
+ close(incoming_fd);
}
return;
}
}
- if (tmp_fd == -1) {
+ if (incoming_fd == -1) {
/* if posn is positive and unseen before then this is our posn*/
if ((incoming_posn >= 0) &&
(s->peers[incoming_posn].eventfds == NULL)) {
@@ -524,15 +524,6 @@ static void ivshmem_read(void *opaque, const uint8_t *buf,
int size)
}
}
- /* because of the implementation of get_msgfd, we need a dup */
- incoming_fd = dup(tmp_fd);
-
- if (incoming_fd == -1) {
- error_report("could not allocate file descriptor %s", strerror(errno));
- close(tmp_fd);
- return;
- }
-
/* if the position is -1, then it's shared memory region fd */
if (incoming_posn == -1) {
--
2.4.3
- [Qemu-devel] [PULL v2 49/50] ivshmem: use little-endian int64_t for the protocol, (continued)
- [Qemu-devel] [PULL v2 01/50] tests: Add ivshmem qtest, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 15/50] ivshmem: remove useless ivshmem_update_irq() val argument, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 07/50] ivshmem: remove unnecessary dup(),
marcandre . lureau <=
- [Qemu-devel] [PULL v2 24/50] ivshmem: migrate with VMStateDescription, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 25/50] ivshmem: shmfd can be 0, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 19/50] ivshmem: improve error handling, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 27/50] ivshmem: add device description, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 30/50] ivshmem: error on too many eventfd received, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 35/50] ivshmem-server: fix hugetlbfs support, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 36/50] docs: update ivshmem device spec, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 46/50] ivshmem: remove EventfdEntry.vector, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 45/50] ivshmem: add hostmem backend, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 43/50] ivshmem: do not keep shm_fd open, marcandre . lureau, 2015/10/15