From nobody Mon Nov 3 14:12:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505958063438844.4007661451656; Wed, 20 Sep 2017 18:41:03 -0700 (PDT) Received: from localhost ([::1]:51383 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duqUA-000583-Gc for importer@patchew.org; Wed, 20 Sep 2017 21:41:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duqRh-0003ca-EC for qemu-devel@nongnu.org; Wed, 20 Sep 2017 21:38:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duqRe-0006yD-Ag for qemu-devel@nongnu.org; Wed, 20 Sep 2017 21:38:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34634) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duqRe-0006xP-5I for qemu-devel@nongnu.org; Wed, 20 Sep 2017 21:38:26 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0A2E015561; Thu, 21 Sep 2017 01:38:25 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-130.bos.redhat.com [10.18.17.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6888E614D6; Thu, 21 Sep 2017 01:38:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0A2E015561 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=jsnow@redhat.com From: John Snow To: qemu-devel@nongnu.org Date: Wed, 20 Sep 2017 21:38:21 -0400 Message-Id: <20170921013821.1673-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 21 Sep 2017 01:38:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2] ide: fix enum comparison for gcc 4.7 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Snow , peter.maydell@linaro.org, mark.cave-ayland@ilande.co.uk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Apparently GCC gets bent over comparing enum values against zero. Replace the conditional with something less readable. Tested-by: Mark Cave-Ayland Signed-off-by: John Snow Reviewed-by: Stefan Hajnoczi --- v2: Second verse, same as the first. Signed-off-by: John Snow --- hw/ide/ahci.c | 2 +- hw/ide/core.c | 2 +- include/hw/ide/internal.h | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 24c65df..32d1296 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -184,7 +184,7 @@ static void ahci_check_irq(AHCIState *s) static void ahci_trigger_irq(AHCIState *s, AHCIDevice *d, enum AHCIPortIRQ irqbit) { - g_assert(irqbit >=3D 0 && irqbit < 32); + g_assert((unsigned)irqbit < 32); uint32_t irq =3D 1U << irqbit; uint32_t irqstat =3D d->port_regs.irq_stat | irq; =20 diff --git a/hw/ide/core.c b/hw/ide/core.c index a19bd90..d63eb4a 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -68,7 +68,7 @@ const char *IDE_DMA_CMD_lookup[IDE_DMA__COUNT] =3D { =20 static const char *IDE_DMA_CMD_str(enum ide_dma_cmd enval) { - if (enval >=3D IDE_DMA__BEGIN && enval < IDE_DMA__COUNT) { + if ((unsigned)enval < IDE_DMA__COUNT) { return IDE_DMA_CMD_lookup[enval]; } return "DMA UNKNOWN CMD"; diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index 180e00e..e641012 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -333,8 +333,7 @@ struct unreported_events { }; =20 enum ide_dma_cmd { - IDE_DMA__BEGIN =3D 0, - IDE_DMA_READ =3D IDE_DMA__BEGIN, + IDE_DMA_READ =3D 0, IDE_DMA_WRITE, IDE_DMA_TRIM, IDE_DMA_ATAPI, --=20 2.9.5