From nobody Mon Apr 29 04:40:01 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=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576235066; cv=none; d=zohomail.com; s=zohoarc; b=hbzcadmIv8r2l1T2x3a4HlyVzwhaVFr9bvgZyI0W/kFb8P/67tr7EK4BJbtosjQW0ieBQG6qJzrw9D1vMoZPJK5OMgTYueDTMPKra/Zdm6CbCgVCCCy9xrx6vQFWb6F1ltGIVR1tIB845RftIExm2by+KxocMi90s0d2QXd3YMw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576235066; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=AmmOFuYGtKlXxuusm4o7US5u79QybDIbfYEE1TIgLbk=; b=hGLouzuFYH7j0lPDcYlYc1XXB8xX0NlBBjKuiSv2nWU+0VC7JDAFebyhdhJ4zGpG6y9NnizHrfenxgSwbidpdr4MySC+368M+/ysq1c5iSE/8aaugs0Duuvu09EY1jArYgop7D9z/M4x77SLpGOF9YZ9GgkNHKV6tsxi314w4Kw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1576235066559431.1886884719513; Fri, 13 Dec 2019 03:04:26 -0800 (PST) Received: from localhost ([::1]:46530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifikC-0007gH-OE for importer@patchew.org; Fri, 13 Dec 2019 06:04:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54095) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ififX-00054B-93 for qemu-devel@nongnu.org; Fri, 13 Dec 2019 05:59:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ififW-0006L8-6v for qemu-devel@nongnu.org; Fri, 13 Dec 2019 05:59:35 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:21220 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 1ififW-0006K3-2d for qemu-devel@nongnu.org; Fri, 13 Dec 2019 05:59:34 -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-147-6KJGTFsLNr-EC8dW4WINIA-1; Fri, 13 Dec 2019 05:59:30 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id A63EE800D48; Fri, 13 Dec 2019 10:59:29 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-134.brq.redhat.com [10.40.204.134]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 216916764A; Fri, 13 Dec 2019 10:59:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576234773; 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; bh=AmmOFuYGtKlXxuusm4o7US5u79QybDIbfYEE1TIgLbk=; b=cG6r2rRmThPqdf3yyNGGY+OGhrcsZb70F+pCofxhFY+GbmvxdGbGI6m7Pqw/so7OscmyyT TLkB9rolBBYfoTDHG0Jk3P3SMfrhpP78I3Om4veIRUa1z5oR2sFX4GRzHnYV2IXhpcxdae QYk/TvL6VuMJrV5JIziWOJopCFi9RSc= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH] hw/isa/isa-bus: Use ISA_NUM_IRQS instead of magic number Date: Fri, 13 Dec 2019 11:59:21 +0100 Message-Id: <20191213105921.9529-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: 6KJGTFsLNr-EC8dW4WINIA-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: 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, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We have a definition for the number of ISA IRQs, use it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/isa-bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index 388800603b..1d79ed133c 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -85,7 +85,7 @@ void isa_bus_irqs(ISABus *bus, qemu_irq *irqs) qemu_irq isa_get_irq(ISADevice *dev, int isairq) { assert(!dev || ISA_BUS(qdev_get_parent_bus(DEVICE(dev))) =3D=3D isabus= ); - if (isairq < 0 || isairq > 15) { + if (isairq < 0 || isairq > >=3D ISA_NUM_IRQS) { hw_error("isa irq %d invalid", isairq); } return isabus->irqs[isairq]; --=20 2.21.0