From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1aWsH1-0003Q6-9f for mharc-qemu-trivial@gnu.org; Fri, 19 Feb 2016 16:07:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWsGz-0003Kh-8X for qemu-trivial@nongnu.org; Fri, 19 Feb 2016 16:07:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWsGv-0005r0-VG for qemu-trivial@nongnu.org; Fri, 19 Feb 2016 16:07:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48435) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWsGl-0005nD-1Y; Fri, 19 Feb 2016 16:07:19 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id AAE33C158459; Fri, 19 Feb 2016 21:07:18 +0000 (UTC) Received: from [10.10.54.114] (vpn-54-114.rdu2.redhat.com [10.10.54.114]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1JL7H3u020630 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 19 Feb 2016 16:07:18 -0500 To: Laszlo Ersek , qemu-devel@nongnu.org References: <1455905587-4347-1-git-send-email-wei@redhat.com> <56C781AE.5050004@redhat.com> <56C78227.4030207@redhat.com> From: Wei Huang Message-ID: <56C78405.4040307@redhat.com> Date: Fri, 19 Feb 2016 15:07:17 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: <56C78227.4030207@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-trivial@nongnu.org, mst@redhat.com Subject: Re: [Qemu-trivial] [Qemu-devel] [PATCH 1/1] virtio-rng: fix condition checking on period_ms X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Feb 2016 21:07:34 -0000 On 02/19/2016 02:59 PM, Laszlo Ersek wrote: > On 02/19/16 21:57, Laszlo Ersek wrote: >> On 02/19/16 19:13, Wei Huang wrote: >>> The condition checking on vrng->conf.period_ms appears to be wrong, >>> conflicting with the error comment following it. >>> >>> Signed-off-by: Wei Huang >>> --- >>> hw/virtio/virtio-rng.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c >>> index 473c044..a06427c 100644 >>> --- a/hw/virtio/virtio-rng.c >>> +++ b/hw/virtio/virtio-rng.c >>> @@ -149,7 +149,7 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp) >>> VirtIORNG *vrng = VIRTIO_RNG(dev); >>> Error *local_err = NULL; >>> >>> - if (!vrng->conf.period_ms > 0) { >>> + if (!(vrng->conf.period_ms > 0)) { >>> error_setg(errp, "'period' parameter expects a positive integer"); >>> return; >>> } >>> >> >> The current condition is absolutely weird, but I think it happens to >> work correctly: >> >> Period_ms has type uint32_t. If it is positive, then !period_ms is zero. >> 0>0 is false, hence the error message is not printed. >> >> If period_ms is zero, then !period_ms is 1. 1>0 is true, hence the error >> message is printed. >> >> I would rewrite the check as >> >> if (vrng->conf.period_ms == 0) { >> error_setg(...) > > ... actually, what the heck are you looking at? :) This has been fixed > up in: > Oops. It looks like I was looking at an older HEAD. :-( Please ignore it. Sorry for the noise and thanks for pointing it out. -Wei > commit a3a292c420d2fec3c07a7ca56fbb064cd57a298a > Author: Amit Shah > Date: Thu Dec 11 13:17:42 2014 +0530 > > virtio-rng: fix check for period_ms validity > > Thanks > Laszlo >