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); }