From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54298) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYEk7-0008Ml-FW for qemu-devel@nongnu.org; Thu, 20 Jul 2017 12:56:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dYEk3-00017t-AT for qemu-devel@nongnu.org; Thu, 20 Jul 2017 12:56:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36400) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dYEk3-000175-4d for qemu-devel@nongnu.org; Thu, 20 Jul 2017 12:55:59 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DA86072D09 for ; Thu, 20 Jul 2017 16:55:57 +0000 (UTC) Date: Thu, 20 Jul 2017 17:55:48 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20170720165547.GF2456@work-vm> References: <20170720163536.26183-1-dgilbert@redhat.com> <20170720164410.GO21566@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170720164410.GO21566@redhat.com> Subject: Re: [Qemu-devel] [PATCH] tests/bios-tables-test: Compiler warning fix List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" Cc: qemu-devel@nongnu.org, mst@redhat.com, imammedo@redhat.com, marcel@redhat.com * Daniel P. Berrange (berrange@redhat.com) wrote: > On Thu, Jul 20, 2017 at 05:35:36PM +0100, Dr. David Alan Gilbert (git) wrote: > > From: "Dr. David Alan Gilbert" > > > > gcc 7.1.1 in fedora 26 moans about the: > > tables = g_new0(uint32_t, tables_nr) > > > > because it can't convince itself that tables_nr is positive. > > This is fallout from g_assert_cmpint no longer necessarily being > > no-return; replace it with a plain g_assert. > > > > Signed-off-by: Dr. David Alan Gilbert > > --- > > tests/bios-tables-test.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c > > index 63da978f0b..564da45f65 100644 > > --- a/tests/bios-tables-test.c > > +++ b/tests/bios-tables-test.c > > @@ -108,7 +108,7 @@ static void test_acpi_rsdt_table(test_data *data) > > /* compute the table entries in rsdt */ > > tables_nr = (rsdt_table->length - sizeof(AcpiRsdtDescriptorRev1)) / > > sizeof(uint32_t); > > - g_assert_cmpint(tables_nr, >, 0); > > + g_assert(tables_nr > 0); > > IMHO your original patch was better - rsdt_table->length is an > uint32_t, and sizeof() evaluates to size_t, but we're assigning > to a local tables_nr that is a signed int. So tables_nr would > be better declared as size_t. That would mean the assert can > just be removed entirely, or replaced by an assert that > rsdt_table->length > sizeof(AcpiRsdtDescriptorRev1) if we're > concerned about that Given that assert was there I'd assumed Marcel was explicitly checking for that case, so my original hack of just making it a uint or size_t didn't seem safe. Checking that rsdt_table->length > sizeof(AcpiRsdtDescriptorRev1) probably is safer; although this is only a sanity assert in a test case, not dealing with user data, so I just made the minimal change. Dave > > Regards, > Daniel > -- > |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| > |: https://libvirt.org -o- https://fstop138.berrange.com :| > |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK