From nobody Sun May 19 03:54:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574689323; cv=none; d=zohomail.com; s=zohoarc; b=l7qNmzyd+iHiiQwVIw1PsKAKrOXW1Ob4xFqSDUrY7XTiDVTMvJe/+mTYfEHKljHv1mlosfUO0RRREnFaUwt96KlORkLIzbVEmwOn6TditqjyAxKQEkIxZUR/llVuyAlL/5YkiQ+fR0sr1Anw/Y0jijtbm6jQ9HSSQQYVUEcrgr8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574689323; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wo8nMmg5eLNgbhvYGkzsTMpiAjxrROXdulWsJagBLNU=; b=HHA0UpsfUQMpvCzBga/gH7TJTHoszMQj8iJdQmEgXrnp6Cl1/5aqu7bvejrk5dYCliWCXg99kKrf156Ni88GmH7tW7qZzdhxvRUsgPeglOm6vhSkMlG/VbbNTW2MvmHAu8Xn7f3NieXhvozr2Pv9HUxaSpKQRm+UgV28lypO5Ww= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574689323871907.2824280759985; Mon, 25 Nov 2019 05:42:03 -0800 (PST) Received: from localhost ([::1]:44090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZEcs-0003dO-Ob for importer@patchew.org; Mon, 25 Nov 2019 08:42:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43966) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZEZr-0000Zw-Kl for qemu-devel@nongnu.org; Mon, 25 Nov 2019 08:38:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZEZp-0007iD-Hf for qemu-devel@nongnu.org; Mon, 25 Nov 2019 08:38:55 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:34320 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 1iZEZn-0007h0-Hl for qemu-devel@nongnu.org; Mon, 25 Nov 2019 08:38:51 -0500 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-208-dxS8kqqFNAau4tSY7DjKEQ-1; Mon, 25 Nov 2019 08:38:49 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CCB2DDB61; Mon, 25 Nov 2019 13:38:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-134.ams2.redhat.com [10.36.116.134]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 83BBF19C6A; Mon, 25 Nov 2019 13:38:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 056A011385C7; Mon, 25 Nov 2019 14:38:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574689130; 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=wo8nMmg5eLNgbhvYGkzsTMpiAjxrROXdulWsJagBLNU=; b=avYSbkXJhQX37uiRckAv8rKlLlRCd6mZRsAoxnGJZyZ/ZJzirUCUADtLyEOucLEaIE1Dw6 +DCn1BLu33jkyIgjZNgGCaf5Qy1oliJqhwG3VQ0Yb65kZe1vUoF05QXCW6nxNkm91ju6OH s1C1Ax7+UIWrZbQ8oq6PiSw1zE1YLzs= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 1/2] util/cutils: Turn FIXME comment into QEMU_BUILD_BUG_ON() Date: Mon, 25 Nov 2019 14:38:45 +0100 Message-Id: <20191125133846.27790-2-armbru@redhat.com> In-Reply-To: <20191125133846.27790-1-armbru@redhat.com> References: <20191125133846.27790-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: dxS8kqqFNAau4tSY7DjKEQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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, tao3.xu@intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" qemu_strtoi64() assumes int64_t is long long. This is marked FIXME. Replace by a QEMU_BUILD_BUG_ON() to avoid surprises. Same for qemu_strtou64(). Fix a typo in qemu_strtoul()'s contract while there. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- util/cutils.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/util/cutils.c b/util/cutils.c index fd591cadf0..b372dd3e68 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -502,7 +502,7 @@ int qemu_strtoul(const char *nptr, const char **endptr,= int base, * Convert string @nptr to an int64_t. * * Works like qemu_strtol(), except it stores INT64_MAX on overflow, - * and INT_MIN on underflow. + * and INT64_MIN on underflow. */ int qemu_strtoi64(const char *nptr, const char **endptr, int base, int64_t *result) @@ -517,8 +517,9 @@ int qemu_strtoi64(const char *nptr, const char **endptr= , int base, return -EINVAL; } =20 + /* This assumes int64_t is long long TODO relax */ + QEMU_BUILD_BUG_ON(sizeof(int64_t) !=3D sizeof(long long));=20 errno =3D 0; - /* FIXME This assumes int64_t is long long */ *result =3D strtoll(nptr, &ep, base); return check_strtox_error(nptr, ep, endptr, errno); } @@ -541,8 +542,9 @@ int qemu_strtou64(const char *nptr, const char **endptr= , int base, return -EINVAL; } =20 + /* This assumes uint64_t is unsigned long long TODO relax */ + QEMU_BUILD_BUG_ON(sizeof(uint64_t) !=3D sizeof(unsigned long long)); errno =3D 0; - /* FIXME This assumes uint64_t is unsigned long long */ *result =3D strtoull(nptr, &ep, base); /* Windows returns 1 for negative out-of-range values. */ if (errno =3D=3D ERANGE) { --=20 2.21.0 From nobody Sun May 19 03:54:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574689500; cv=none; d=zohomail.com; s=zohoarc; b=f7nTAwkeXSCdoyc5qtD4HidqBn0AvzgEZsfmEsVvPR1Yss9CcnBAXqHZjZ5/M5LFYi/x2UXREnFERD4H+lhFjKRrmyG8LkaoVxVuc2JebTSDEIm3oBJO/vSqUbJ5wOxn3XfXUKbSAmxlVRUvhqyXnCVUQ8pqdgSwmxvya/gP9/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574689500; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bCqTIRv4rNdiRxSSYNe+1CG0I+mTlFwCDHW4Yah4NRg=; b=loRNULLaWE3qN+n4mF0C/a1jSmAETMNFHSvEZxAs568MAVwQZc9yX6pzo6OXuQrkxTZAnaY/dEuiqMdIv5Ra7DbMCkSQ5y8fzp4rnZmkrjJpjpA47AfKY6ji9RlwldtMe3i5fu81W+VXsDxuuOSx//LGo4Xqp0+0dSa1U5qbkHg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574689500210507.3497506336836; Mon, 25 Nov 2019 05:45:00 -0800 (PST) Received: from localhost ([::1]:44134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZEfi-0006OG-NV for importer@patchew.org; Mon, 25 Nov 2019 08:44:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43990) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZEZt-0000aq-IL for qemu-devel@nongnu.org; Mon, 25 Nov 2019 08:38:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZEZr-0007lq-Hh for qemu-devel@nongnu.org; Mon, 25 Nov 2019 08:38:57 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:48141 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 1iZEZp-0007hs-IV for qemu-devel@nongnu.org; Mon, 25 Nov 2019 08:38:54 -0500 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-328-WkZ3LYmuO06nFinX2KCT4A-1; Mon, 25 Nov 2019 08:38:49 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CE5BA1801B88; Mon, 25 Nov 2019 13:38:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-134.ams2.redhat.com [10.36.116.134]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8813E5D6AE; Mon, 25 Nov 2019 13:38:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0803D11366CC; Mon, 25 Nov 2019 14:38:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574689132; 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=bCqTIRv4rNdiRxSSYNe+1CG0I+mTlFwCDHW4Yah4NRg=; b=LHKYWahf2PHGj7Jgfw0XMybtCPD0HpPOEXPe9iXw9XlZlDLzyAR+55JY3U6GtXe5aYcp+x mnhQas3FGvhf6v0gb6Fyn6r3+7cdbvF8pw2cNWgQZ+6tZjahyffjLoNLaeGQIyv2KzV94h QI6uiI3ERWMcBMV0rS0ZWd33MOcDRuw= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 2/2] test-keyval: Tighten test of trailing crap after size Date: Mon, 25 Nov 2019 14:38:46 +0100 Message-Id: <20191125133846.27790-3-armbru@redhat.com> In-Reply-To: <20191125133846.27790-1-armbru@redhat.com> References: <20191125133846.27790-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: WkZ3LYmuO06nFinX2KCT4A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.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, tao3.xu@intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" test_keyval_visit_size() should test for trailing crap after size with and without suffix. It does test the latter: "sz2=3D16Gi" has size "16G" followed by crap "i". It fails to test the former "sz1=3D16E" is a syntactically valid size that overflows uint64_t. Replace by "sz1=3D0Z". Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- tests/test-keyval.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-keyval.c b/tests/test-keyval.c index 09b0ae3c68..e331a84149 100644 --- a/tests/test-keyval.c +++ b/tests/test-keyval.c @@ -478,7 +478,7 @@ static void test_keyval_visit_size(void) visit_free(v); =20 /* Trailing crap */ - qdict =3D keyval_parse("sz1=3D16E,sz2=3D16Gi", NULL, &error_abort); + qdict =3D keyval_parse("sz1=3D0Z,sz2=3D16Gi", NULL, &error_abort); v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); qobject_unref(qdict); visit_start_struct(v, NULL, NULL, 0, &error_abort); --=20 2.21.0