From patchwork Fri Oct 2 19:09:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 525736 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 62B841402D5 for ; Sat, 3 Oct 2015 05:27:51 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=upPLVX20; dkim-atps=neutral Received: from localhost ([::1]:34619 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zi5zh-0005im-9b for incoming@patchwork.ozlabs.org; Fri, 02 Oct 2015 15:27:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zi5ic-0007WS-Iy for qemu-devel@nongnu.org; Fri, 02 Oct 2015 15:10:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zi5iY-00072c-Tq for qemu-devel@nongnu.org; Fri, 02 Oct 2015 15:10:10 -0400 Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]:33060) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zi5iY-00071C-LR for qemu-devel@nongnu.org; Fri, 02 Oct 2015 15:10:06 -0400 Received: by wiclk2 with SMTP id lk2so46700971wic.0 for ; Fri, 02 Oct 2015 12:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=udEgIBSg/BnuHH1wW0Y76jrQQjyFzNp7pNYATcgDDwE=; b=upPLVX20jmrDTSyvkzdiW6jDqydJ8nqQ+clIKM/uwWOEu35WtBXoOKqRCSoMVbWzi2 D1GsifhS1SuRZLI2+3n7F7H64rsDMfeuAqE+L/QxkqgBtlpRUErpv9NqEYrExey6YcKd gkSn/YdoUCCT4o1L1Gs4dlQDKyCJzfgVFE5bFQAmhcnkW6+qlppYFQ/wAbshEtiZZtDj JlOGlkiYVVnOlxMnAo2nkRu2cIFvVQmooj0+uFSsdHJmojLuHKSyJDaXtgS2No1uvTrl ToRbZTO3ihuUEOvs69eHXNi3GUTikbww7YhkOUfCw6o2YcccckfQcjoWtciBTKnGTZg7 +a6Q== X-Received: by 10.180.208.49 with SMTP id mb17mr457990wic.52.1443813006073; Fri, 02 Oct 2015 12:10:06 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id ry1sm12719215wjb.24.2015.10.02.12.10.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Oct 2015 12:10:05 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Fri, 2 Oct 2015 21:09:09 +0200 Message-Id: <1443812991-17356-7-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1443812991-17356-1-git-send-email-marcandre.lureau@redhat.com> References: <1443812991-17356-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::233 Cc: drjones@redhat.com, claudio.fontana@huawei.com, stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com, cam@cs.ualberta.ca Subject: [Qemu-devel] [PATCH v5 06/48] ivshmem: remove unnecessary dup() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marc-André Lureau qemu_chr_fe_get_msgfd() transfers ownership, there is no need to dup the fd. Signed-off-by: Marc-André Lureau Reviewed-by: Claudio Fontana --- 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) {