From patchwork Wed Oct 23 12:26:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 1182093 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="UIS9XmOP"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46yqR24CZGz9sP3 for ; Wed, 23 Oct 2019 23:28:13 +1100 (AEDT) Received: from localhost ([::1]:34698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNFkJ-0002Do-KZ for incoming@patchwork.ozlabs.org; Wed, 23 Oct 2019 08:28:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34565) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNFjF-0002Cs-1J for qemu-devel@nongnu.org; Wed, 23 Oct 2019 08:27:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNFjE-00005g-2y for qemu-devel@nongnu.org; Wed, 23 Oct 2019 08:27:04 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:26897 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNFjD-00005K-Rd for qemu-devel@nongnu.org; Wed, 23 Oct 2019 08:27:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571833622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KJfaUl5cMM0f8c373RKUEgJAWU/MIbd+RP5kn31u8gQ=; b=UIS9XmOPedAuvN58iAYIW2VP58gr3OusVnGA02Dg/hopMQ4SdV6iG5R4RzKo5+voQjSz/U 0Y6XWiCPX8Ad9PKoK59qg6DuBsDba8EI9vFhfhEdlODregoPrxZXxSkq2k5onE3IjCKcly 0/D7kVw8ot7qresYDgi6fJpa0vAo1cw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-369-MCpMOBUTN22inhh-EIOsTA-1; Wed, 23 Oct 2019 08:26:58 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0F94B1005509; Wed, 23 Oct 2019 12:26:57 +0000 (UTC) Received: from fziglio.remote.csb (unknown [10.34.247.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84D3560126; Wed, 23 Oct 2019 12:26:55 +0000 (UTC) From: Frediano Ziglio To: Michael Tokarev , Laurent Vivier Subject: [PATCH 1/3] util/async: avoid useless cast Date: Wed, 23 Oct 2019 13:26:50 +0100 Message-Id: <20191023122652.2999-1-fziglio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: MCpMOBUTN22inhh-EIOsTA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org, Frediano Ziglio Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" event_notifier_dummy_cb is already compatible with EventNotifierHandler. Signed-off-by: Frediano Ziglio Reviewed-by: Laurent Vivier --- util/async.c | 1 - 1 file changed, 1 deletion(-) diff --git a/util/async.c b/util/async.c index ca83e32c7f..b1fa5319e5 100644 --- a/util/async.c +++ b/util/async.c @@ -429,7 +429,6 @@ AioContext *aio_context_new(Error **errp) aio_set_event_notifier(ctx, &ctx->notifier, false, - (EventNotifierHandler *) event_notifier_dummy_cb, event_notifier_poll); #ifdef CONFIG_LINUX_AIO From patchwork Wed Oct 23 12:26:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 1182095 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="QyryMRBq"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46yqS12zL7z9sP3 for ; Wed, 23 Oct 2019 23:29:05 +1100 (AEDT) Received: from localhost ([::1]:34706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNFl8-0002fX-SJ for incoming@patchwork.ozlabs.org; Wed, 23 Oct 2019 08:29:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34596) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNFjK-0002Dh-Cm for qemu-devel@nongnu.org; Wed, 23 Oct 2019 08:27:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNFjI-00006u-DK for qemu-devel@nongnu.org; Wed, 23 Oct 2019 08:27:10 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:57445 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNFjI-00006e-9c for qemu-devel@nongnu.org; Wed, 23 Oct 2019 08:27:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571833626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QVCVfHYT96hzaV66WzMe1iyTCsyaP84kD6J7u1JNZGM=; b=QyryMRBqKceVGD16zr231utK9gC1n/QPtZz3q8fG/KaV6V52Z2QrBbHx9mKN8k8V7T7y6z uFF4fVTtbH/wT4InuFF0M5cDaIAEClMhlpb2qoGVa9wYvMJrsb6EDExSgdB9kRBRcZ78uq NgmHhghi2wxNZfh1unFFKRjAc1WHyuw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-43-ZLdWZhaDOEek3e7twv2YEg-1; Wed, 23 Oct 2019 08:26:59 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DA14F107AD31; Wed, 23 Oct 2019 12:26:58 +0000 (UTC) Received: from fziglio.remote.csb (unknown [10.34.247.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D520600CC; Wed, 23 Oct 2019 12:26:57 +0000 (UTC) From: Frediano Ziglio To: Michael Tokarev , Laurent Vivier Subject: [PATCH 2/3] event_notifier: avoid dandling file descriptor in event_notifier_cleanup Date: Wed, 23 Oct 2019 13:26:51 +0100 Message-Id: <20191023122652.2999-2-fziglio@redhat.com> In-Reply-To: <20191023122652.2999-1-fziglio@redhat.com> References: <20191023122652.2999-1-fziglio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: ZLdWZhaDOEek3e7twv2YEg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org, Frediano Ziglio Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" If rfd is equal to wfd the file descriptor is closed but rfd will still have the closed value. The EventNotifier structure should not be used again after calling event_notifier_cleanup or should be initialized again but make sure to not have dandling file descriptors around. Signed-off-by: Frediano Ziglio Reviewed-by: Laurent Vivier --- util/event_notifier-posix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c index 73c4046b58..00d93204f9 100644 --- a/util/event_notifier-posix.c +++ b/util/event_notifier-posix.c @@ -80,8 +80,8 @@ void event_notifier_cleanup(EventNotifier *e) { if (e->rfd != e->wfd) { close(e->rfd); - e->rfd = -1; } + e->rfd = -1; close(e->wfd); e->wfd = -1; } From patchwork Wed Oct 23 12:26:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 1182094 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="K7k/s3Ui"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46yqR70Kncz9sP3 for ; Wed, 23 Oct 2019 23:28:19 +1100 (AEDT) Received: from localhost ([::1]:34704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNFkO-0002Ix-Q6 for incoming@patchwork.ozlabs.org; Wed, 23 Oct 2019 08:28:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34618) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNFjN-0002Eg-HS for qemu-devel@nongnu.org; Wed, 23 Oct 2019 08:27:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNFjM-00007z-HN for qemu-devel@nongnu.org; Wed, 23 Oct 2019 08:27:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:53467 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNFjM-00007Z-DQ for qemu-devel@nongnu.org; Wed, 23 Oct 2019 08:27:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571833630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CGzk93WfUIysNZwO3uWZD42RzDLieVYJKoUgml5RCA8=; b=K7k/s3Ui+Cu+LeNUV7RBUAgWuFjkMwH5GY5w+EqtqaDcHIpanAXIzL0oKEfXTARwQmHEYk Us/7mokuAH01vF5EN7asu9sZ+MvJhYD8fqSh5j6X/ByazBmsYNHDUZhPw/qsw9eyHCqlWT GL3ZO2E2O6ulLIjktwF3EerAlAv2Jl0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-165-BKHL_aazPmaA7aF3o3yCHA-1; Wed, 23 Oct 2019 08:27:04 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 42999801E5C; Wed, 23 Oct 2019 12:27:03 +0000 (UTC) Received: from fziglio.remote.csb (unknown [10.34.247.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 36285600CC; Wed, 23 Oct 2019 12:26:59 +0000 (UTC) From: Frediano Ziglio To: Michael Tokarev , Laurent Vivier Subject: [PATCH 3/3] qemu-timer: reuse MIN macro in qemu_timeout_ns_to_ms Date: Wed, 23 Oct 2019 13:26:52 +0100 Message-Id: <20191023122652.2999-3-fziglio@redhat.com> In-Reply-To: <20191023122652.2999-1-fziglio@redhat.com> References: <20191023122652.2999-1-fziglio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: BKHL_aazPmaA7aF3o3yCHA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org, Frediano Ziglio Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Frediano Ziglio Reviewed-by: Laurent Vivier Reviewed-by: Eric Blake --- util/qemu-timer.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/util/qemu-timer.c b/util/qemu-timer.c index d428fec567..094a20a05a 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -322,11 +322,7 @@ int qemu_timeout_ns_to_ms(int64_t ns) ms = DIV_ROUND_UP(ns, SCALE_MS); /* To avoid overflow problems, limit this to 2^31, i.e. approx 25 days */ - if (ms > (int64_t) INT32_MAX) { - ms = INT32_MAX; - } - - return (int) ms; + return (int) MIN(ms, (int64_t) INT32_MAX); }