From nobody Sat May 18 01:17:43 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1598956913; cv=none; d=zohomail.com; s=zohoarc; b=knYtOYeBiOcgtRaif7Tkp+LldLQgGkDtOLasc9c3zGdcQ96wh34+cxKNx4A83jvjTJ4p9cORkhBDAkddjm7X7ZaZkDRvKFjsjIavV8RNy8C1gnLAb3BF1DHYo1pO/K9/7Bcc4zeRfVwZz/bn5pW834evg47MrMivuOKl6e67GHo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598956913; 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=os2g75NZJynKLqxUCLFQR7EXSgQAqSybj5K1q1ubV4c=; b=HSO37k3JhrNxF/ERqgwBph3OelvNv8wLZoE6XmDzogS/p/RPbkwYbhKSVudJoXSuokgYZQgGeLjwnehV3/5W/tVfrkEmALgW6vMjVhDTyZ1nf4us0UTxMQdPCmUge44qw0tXWH1WKKCW2WiJQfw0Nud3xnqKrVSRD3jWtwhDuSw= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598956913570245.24457333065584; Tue, 1 Sep 2020 03:41:53 -0700 (PDT) Received: from localhost ([::1]:34508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD3jc-0006LM-K6 for importer@patchew.org; Tue, 01 Sep 2020 06:41:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD3ie-0004WO-7S; Tue, 01 Sep 2020 06:40:52 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:33963) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kD3ic-0001rs-QE; Tue, 01 Sep 2020 06:40:51 -0400 Received: by mail-wm1-x344.google.com with SMTP id c19so676043wmd.1; Tue, 01 Sep 2020 03:40:49 -0700 (PDT) Received: from localhost.localdomain (50.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.50]) by smtp.gmail.com with ESMTPSA id o9sm1541461wrw.58.2020.09.01.03.40.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 03:40:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=os2g75NZJynKLqxUCLFQR7EXSgQAqSybj5K1q1ubV4c=; b=q7oDLRCBSQlEals5F8HOqPCDlbI33XdKStZTwZUOsfdz9JxRIj0zVYF5hbA4OsrKT9 bUOVVyDVwkp0kji5QextZq+x5++t3LfpgoHzw+Kx/oZlQOYBDZQ7TbnR2Jg332Ly25Ws 4vG75strPSdKZjSBvxseUYdO56XKA51JEI8A1UqDqEzmZCzdcFNJataFqIeOk3g8TSkY QVOdss3R6D5Xke0+qVKRKtJLC1fcMf73d9xRhb1I1lPFykTIqsl58rRafyLVtB2Ba7JG lzx5YYaCalh003u9BQKzFo9TifRZwnT2xNAf8GHnaCjC1whFyjFq2EFK1TWPwT39ChOf XKcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=os2g75NZJynKLqxUCLFQR7EXSgQAqSybj5K1q1ubV4c=; b=GqicHqD4U5oxeBCSDNlYikXCKuwbtm2tXcN2ITlZc862+rAgb2LvgnvVViR/UPJN35 675lBhc8PfUwUu/eM6xKbg9fsN4Z2MXVyr1QhsbxhooLtvTvLh40fhndrbD2muT3eyrs Az03Ppdqo7Ezf+O9boR//CUSJbhAk3V2D182j3rBQbDVysAiMnqjFcmU3oNFSiUACUTs 64XgbGu53gKMgH2gmnwb0LYlgMJMdztZf8kaSuY3IlzkG2HDUbU+eZjNGeDVM3azZLzm g7Qzz3w/YZ5lhCC0QS+CLU8EAKK9LkcUYPdwALSfzfxWbc/bfSfuE58xRbimrkiLl+BN EKHA== X-Gm-Message-State: AOAM532Bp4d5MbGwMkqnYQp+e1jD+6Pkxp+23BpnYrYmx0mef93avHL9 8cGTNljFi1j+yk9NYY5vl3XZZUeUV5A= X-Google-Smtp-Source: ABdhPJwZ9J6pck+SzQ737LShkB24MvQsS94u14Hs3PFPrhRzxwy6Fzs8u86oa8BO6VKkDqtDuTOoyQ== X-Received: by 2002:a1c:c256:: with SMTP id s83mr1152559wmf.93.1598956848137; Tue, 01 Sep 2020 03:40:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/5] hw/gpio/max7310: Remove impossible check Date: Tue, 1 Sep 2020 12:40:39 +0200 Message-Id: <20200901104043.91383-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200901104043.91383-1-f4bug@amsat.org> References: <20200901104043.91383-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Peter Maydell , Aleksandar Rikalo , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Huacai Chen , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The max7310_gpio_set() handler is static and only used by qdev_init_gpio_in, initialized with 8 IRQs. The 'line' argument can not be out of the [0-8[ range. Remove the dead code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/gpio/max7310.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c index bebb4030d27..7f5de189acf 100644 --- a/hw/gpio/max7310.c +++ b/hw/gpio/max7310.c @@ -8,9 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i2c/i2c.h" -#include "hw/hw.h" #include "hw/irq.h" #include "migration/vmstate.h" #include "qemu/module.h" @@ -176,8 +174,6 @@ static const VMStateDescription vmstate_max7310 =3D { static void max7310_gpio_set(void *opaque, int line, int level) { MAX7310State *s =3D (MAX7310State *) opaque; - if (line >=3D ARRAY_SIZE(s->handler) || line < 0) - hw_error("bad GPIO line"); =20 if (level) s->level |=3D s->direction & (1 << line); --=20 2.26.2 From nobody Sat May 18 01:17:43 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1598956921; cv=none; d=zohomail.com; s=zohoarc; b=l5v2tXvw6M81Sex2v2bwoz0XCCysX3iWtc77KYCfNrc9fUpnhQqLjw33kuzefQZE99L5zhWfmXPyrZI1wQk+Q2cZbMatdjE9NO1wTD1kx8wbDwCLMY/9PzXVfbuepD1IKtWb+rDDVGXhloa1YO2kLvdYYQyiXMkCG2lSFltFoOs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598956921; 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=zZvjWb7AknUsK/mu73xU4Jmjdq77tQz7mAep9gjBMZM=; b=RehZ0BAp+kxqymfuS62KAGc2AjiBdZ7UgdwPOFFdRXB+S53s4n7zD6by1I5ec0B6MkJXhz8VGrnzBIYXX9shGMw3o4sOuFAU5g9E1s0wDro7MDkoY3GGp+7PTLUuEyR0rXyqzMA4iuPJSNqeCkXaDRmHxglO9edGiGLz6Vvb1E8= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598956921456249.1997679086885; Tue, 1 Sep 2020 03:42:01 -0700 (PDT) Received: from localhost ([::1]:35454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD3jk-0006js-Mi for importer@patchew.org; Tue, 01 Sep 2020 06:42:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD3if-0004bJ-SU; Tue, 01 Sep 2020 06:40:53 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:35171) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kD3ie-0001s9-8U; Tue, 01 Sep 2020 06:40:53 -0400 Received: by mail-wm1-x343.google.com with SMTP id o21so677717wmc.0; Tue, 01 Sep 2020 03:40:50 -0700 (PDT) Received: from localhost.localdomain (50.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.50]) by smtp.gmail.com with ESMTPSA id o9sm1541461wrw.58.2020.09.01.03.40.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 03:40:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zZvjWb7AknUsK/mu73xU4Jmjdq77tQz7mAep9gjBMZM=; b=tZk9XZDZ6FeyZVvF/47xxgq0ilvRYSYUnU41wk2f1ioKiPjKqvqSJqAoawzjWKIUi+ bI23K1Q1NoirJzR+8wRO4yzR0vjTz6b4DWCuUNu/LeQTqSGfq4Nc8VmR6sNN1QyQKrn2 bamqUnpicfiD6gy2WqwjyAA7edcv0J1MOJAPwE5ceFadbo6KkUKRBqBZbzyVjuaRtgXA /aNG+Ar/h7cfuNAWqaHGuTteQn+CkKS2bl+8Dhg0x+Iy93YXlCnzTr3ZdMvfpyryTXlV T2zwBYzFAlzaFjRbfto1F28HSHATy/EO22jzCZ8FALqtHvGjBTdjz7QY2zgh14g+Z8zq jQZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zZvjWb7AknUsK/mu73xU4Jmjdq77tQz7mAep9gjBMZM=; b=uIdW2Teq405TkT75Lxw/U93Fze7JjpvYfXfPY47iqk7gdwVX2Fygoi3b4yezGoV889 D0F4VaJ6vuI/vmkg4iEUP5jO1qde0JPy/e58Hrqmd2Cv3XdgvnWEZFl817PV8AoMrZcu sb6SNYn+9WI7EsUqoF+jMp95Ykv6oEwT62b8LEs/iUEvugpw3AOnjOxbNr5cmMFucZjY OAeaasuDoeGX+bXscRNKSmU5CaM4p8ekYPtXKkxWVo1vrFMK8hT/GZ9VfoR0vPRpamp+ 7WFlWeOd6TQgymdDY9OX40wFmqtdw84t/mOpl/gUayVPYmHpDvlZpc/MucnI69DDzkkn iDXg== X-Gm-Message-State: AOAM532ysVWUk2vYRBWSY0K1Lu0ifdJzvA054WNVjzCXBLP3b3Fg4Ro3 Ajmvdm8PQ0119ya4uAYIa5nQEXr5UdI= X-Google-Smtp-Source: ABdhPJwiApc9hJMel2OUL9w5WmhWYMkx6MHEyA5Hasx1HxfoQGJSMenbwAXJybW/jhPFQw/pvEA89Q== X-Received: by 2002:a7b:c3c8:: with SMTP id t8mr1121792wmj.101.1598956849831; Tue, 01 Sep 2020 03:40:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/5] hw/mips/fuloong2e: Convert pointless error message to an assert() Date: Tue, 1 Sep 2020 12:40:40 +0200 Message-Id: <20200901104043.91383-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200901104043.91383-1-f4bug@amsat.org> References: <20200901104043.91383-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Peter Maydell , Aleksandar Rikalo , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Huacai Chen , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Displaying "vt82c686b_init error" doesn't give any hint about why this call failed. As this message targets developers and not users, replace the pointless error message by a call to assert() which will provide more useful information. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Huacai Chen Reviewed-by: Richard Henderson --- hw/mips/fuloong2e.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 8ca31e5162c..f28609976bf 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -240,10 +240,7 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus= , int slot, qemu_irq intc, PCIDevice *dev; =20 isa_bus =3D vt82c686b_isa_init(pci_bus, PCI_DEVFN(slot, 0)); - if (!isa_bus) { - fprintf(stderr, "vt82c686b_init error\n"); - exit(1); - } + assert(isa_bus); *p_isa_bus =3D isa_bus; /* Interrupt controller */ /* The 8259 -> IP5 */ --=20 2.26.2 From nobody Sat May 18 01:17:43 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1598957065; cv=none; d=zohomail.com; s=zohoarc; b=KLhGKr01fpw0oMlksA4LulK3VMYs6IxThugqSXP7E+k3n1pih0VV3WE4XgvbtiL7sVoEejPqzDjdG+zzyxjzmK4axI9Pf/JWFXqjtU9c+7WT3RsNysI2KNUg7V3lxx1fnSEU5P1fx365vM8hTJgOkO7Erjt9AQjjVDDcvsGwY1k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598957065; 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=hzm65kQvKrAgJRdgdcCTLRYl0kqFFHOY2vCCMJID1VE=; b=eAg3aL/OYDXkRflbPOd5xvS+nI1WDKwVfrPb/rDBGr1WsWyPCkyemPfugniAeFTa7PIvwXziwlLIIxWnBs2mWaL16Jlz5w4126jNt1HMQtUfT4K9k1AGg+FUe6+p7OZZg97hGuJQOsGz1Hy3+h7qlYMMRwnIWPodF6DyC2srMdw= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598957065066385.5046646880387; Tue, 1 Sep 2020 03:44:25 -0700 (PDT) Received: from localhost ([::1]:44562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD3m4-0002De-B7 for importer@patchew.org; Tue, 01 Sep 2020 06:44:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD3ih-0004h2-Gy; Tue, 01 Sep 2020 06:40:55 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:39737) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kD3ig-0001sU-1s; Tue, 01 Sep 2020 06:40:55 -0400 Received: by mail-wm1-x342.google.com with SMTP id b79so657899wmb.4; Tue, 01 Sep 2020 03:40:52 -0700 (PDT) Received: from localhost.localdomain (50.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.50]) by smtp.gmail.com with ESMTPSA id o9sm1541461wrw.58.2020.09.01.03.40.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 03:40:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hzm65kQvKrAgJRdgdcCTLRYl0kqFFHOY2vCCMJID1VE=; b=eV8Pd2s/JWIFS4zIt5dXGLHw3hfwdNdS66j/QudRZnXb80PJCDKU0yctFfpyr+kjD5 TFpYtzZm8b0BFsOFFcT+mipaNfmaW/ZhHOBH7fiCs12gfKgbEoalLnISXXJdNFF/Ybxx w42oiTur8Kt0YJYOaF9oyGb3H7xm2OJxCMLf+zpanHXbdmNEmb3rkqwBEjzx23g0EozI /oEgYduAB525/aohHixV6LkVi6mQx7a+QjIyXKBSu12RQcyZHEhzFAA9vIt42LtZvYFM pd6gCMB7WlcPWELWAtekjBOEIqbUBtiNwaAYxn26096ke1oTyBkhfhk6rfDyJeoCZcBi nvXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hzm65kQvKrAgJRdgdcCTLRYl0kqFFHOY2vCCMJID1VE=; b=Voe16Ltwe3bMgXt9DS7wz4InARvIZA1Soxw8mRQjXd8adwGG5/ZG+g65z15WAeFWiM 9GVAKP3YmdamgoZhXmM7XUt/3CTjgCUYFjrV5Ji/W2Q7Fs2nVUnDDTyRagDaYFQ9oZfU +QVVQKHnITMdqLhOecCODCuQWtZs9cyy+f8bZ7ZjjpCRcLK45hkvsBwfB6t3GpdfsQpV +rKs/tP3YRJh3W1f/CRlmst08gKyzh8Nynzkxz3vAyPN4+iNJIQL56p8w3DjasBAMiuM f0UlPu9amOwrof0ZhhUHxaxm3u9XSFAuopf9zCo/b5EmLUDm760hjwxx8qKFRiA3w4Rc ApQA== X-Gm-Message-State: AOAM531mqoApbvjWFkbjH5JERcgtJ/YZSQgb2kAan95pjZilfI6l+bK6 TdNYg8PoJXgRm1bkC/+pzBQzJwq0/rM= X-Google-Smtp-Source: ABdhPJw+niaClw4SraDQlPT/ijlyk58KHJmwU9bhxNJvmqQqEIRgVtXwO7M3YpwP+DYtO06Q7nC3vg== X-Received: by 2002:a1c:28c1:: with SMTP id o184mr1197405wmo.91.1598956851497; Tue, 01 Sep 2020 03:40:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/5] hw/ppc/ppc4xx_pci: Use ARRAY_SIZE() instead of magic value Date: Tue, 1 Sep 2020 12:40:41 +0200 Message-Id: <20200901104043.91383-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200901104043.91383-1-f4bug@amsat.org> References: <20200901104043.91383-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Peter Maydell , Aleksandar Rikalo , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Huacai Chen , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Replace the magic '4' by ARRAY_SIZE(s->irq) which is more explicit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Gibson Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Richard Henderson --- hw/ppc/ppc4xx_pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c index 3ea47df71fe..cd3f192a138 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -320,7 +320,8 @@ static void ppc4xx_pcihost_realize(DeviceState *dev, Er= ror **errp) =20 b =3D pci_register_root_bus(dev, NULL, ppc4xx_pci_set_irq, ppc4xx_pci_map_irq, s->irq, get_system_memor= y(), - get_system_io(), 0, 4, TYPE_PCI_BUS); + get_system_io(), 0, ARRAY_SIZE(s->irq), + TYPE_PCI_BUS); h->bus =3D b; =20 pci_create_simple(b, 0, "ppc4xx-host-bridge"); --=20 2.26.2 From nobody Sat May 18 01:17:43 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1598957040; cv=none; d=zohomail.com; s=zohoarc; b=G7hSwDNhpfTvyh29W8LFqfwyL1QWJFOZZuTExcp98Z54t1h/kiKSEJwxR95JDKQEImBGS9ld4ludvSM5Tyf1kzL7c07nuNlr7TWGjS/ohXyoTD1X+OfMQmogSDgQnsD/ctyUqllH+BvYLBCD4TxIDefUw2CJiPqkIcEQkxhFwFE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598957040; 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=QM/qItNwIVdoGPTKGlbv5UVZGHDIASoQ0JbROkkPkZk=; b=HJduJPAZF8WMumDG/IvvkADBM6cj83ivoivrzOKkQ1FlFYmiJmwSO6LzcxDpJC2AQaMmbP4R/RKvG3x7K34J1pn/PdvCgdXusqqdfVvw0eo/YmF3ZybCvtBEghpch5ET4AugJ39F9f3gWSKiv0ThB+6+dXiDa+QEnq7RS/NSTxw= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598957040216567.8612940694935; Tue, 1 Sep 2020 03:44:00 -0700 (PDT) Received: from localhost ([::1]:43610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD3lf-0001pY-BE for importer@patchew.org; Tue, 01 Sep 2020 06:43:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD3ij-0004mG-97; Tue, 01 Sep 2020 06:40:57 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:38669) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kD3ih-0001sm-Qa; Tue, 01 Sep 2020 06:40:56 -0400 Received: by mail-wr1-x441.google.com with SMTP id g4so463209wrs.5; Tue, 01 Sep 2020 03:40:54 -0700 (PDT) Received: from localhost.localdomain (50.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.50]) by smtp.gmail.com with ESMTPSA id o9sm1541461wrw.58.2020.09.01.03.40.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 03:40:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QM/qItNwIVdoGPTKGlbv5UVZGHDIASoQ0JbROkkPkZk=; b=ITHAeOB7hg0WDXlzVCSmo58ARpY6dRSf1ppu3qg6z1SBzGe+LEVD3bnalTesNfsLhh kYq4W/KBAqRUaxrbMf7fSosDe38aS0SmNZm5rPf2WVPT5cUcft8JQsi7WSGv2ng74QV2 ia4wOdE4GROioj31NLunxLdJXyTsjqRZ6OpqrLUtOVGB+9YlUwwaESvIE9gE8tvL2/pf Y9Vuxg5UJjG3aLsfdNSXMfGfTL3XFoFD4DROxwn5rs9Qqf9OkjwyHs2SQGkLCdBaWAg1 QWlTuvS850mVdhEYgGpaCAiN+Yj+IgE8s5+m6oPii1n6IoEoqDw2XG/0+bpxtH3kjEOD nBVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QM/qItNwIVdoGPTKGlbv5UVZGHDIASoQ0JbROkkPkZk=; b=dv1mB2aPDmY979UND2Qhb69PMU217lCDw8bD/HrDNZ9YvsR6FkJWjnUnLnyVHTeq2O Eb5gi032z1SVklq0G5GEtsqVbJzfb8R+0LxGFuosQiGgOsPKz6N1rCduKzTW9FApDQTX 7Sx920XIZ2T4Mdh25pePn0h+S5nCe8KSS0nxYhwTtUqeGyksRjEjhvD5Fxz8GT3doL4c HSwRPT9I639H89zG3Q1Hh1XTkImmDrtHhR1B8OVAd1FcrojGflKX7kLJylKwVHcRUnz6 VerL/SYVsA1vtHzBw+xuXqIXG/J9VcwpzXYIWTpBm4uYvJDk0EzOOPbHs/VGWlJkhgHY 5gzQ== X-Gm-Message-State: AOAM5303VIDlkci2Oaypq5NqPZ84e55FdBboWtj15ptKYQm/n54iJAtT H5NM9nC795lwY58nDN3frplfcmY9Ru8= X-Google-Smtp-Source: ABdhPJwXl28ngZChT+9qkSgHjaRIy03w+6BZ5SFIjXqyP2iihqusROiWuLYBsCw2R23671WYjEBwyA== X-Received: by 2002:a5d:63d1:: with SMTP id c17mr1201861wrw.241.1598956853136; Tue, 01 Sep 2020 03:40:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/5] hw/ppc/ppc4xx_pci: Replace pointless warning by assert() Date: Tue, 1 Sep 2020 12:40:42 +0200 Message-Id: <20200901104043.91383-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200901104043.91383-1-f4bug@amsat.org> References: <20200901104043.91383-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Peter Maydell , Aleksandar Rikalo , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Huacai Chen , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We call pci_register_root_bus() to register 4 IRQs with the ppc4xx_pci_set_irq() handler. As it can only be called with values in the [0-4[ range, replace the pointless warning by an assert(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Gibson Reviewed-by: Richard Henderson --- hw/ppc/ppc4xx_pci.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c index cd3f192a138..503ef46b39a 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -256,10 +256,7 @@ static void ppc4xx_pci_set_irq(void *opaque, int irq_n= um, int level) qemu_irq *pci_irqs =3D opaque; =20 trace_ppc4xx_pci_set_irq(irq_num); - if (irq_num < 0) { - fprintf(stderr, "%s: PCI irq %d\n", __func__, irq_num); - return; - } + assert(irq_num >=3D 0); qemu_set_irq(pci_irqs[irq_num], level); } =20 --=20 2.26.2 From nobody Sat May 18 01:17:43 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1598957065; cv=none; d=zohomail.com; s=zohoarc; b=LYFPd2PjAt+AX5L/21NnFmjzB7cJaGgOEpShyKe6CtZB7NFCwFaWfU7WUgUIOMr6wWHVsM9+9ZoCL5GUsVijD9ldMjiNIbpbeZTM57XbaebeGa2VY+sSVwg4mpiSQIkC0ORQQ997MVIRyvgyJ5lqhfWU+YyGRnm5dOMpfneqBPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598957065; 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=/6T9K6cB8UVV4OMBVpNqFssF0Hs6NHMYQ4tqHB6tDmc=; b=RB67Wqg22KXMwyK+yGpnSQPoCZJ7bPPx65lo9EGl3xifg2x9FLL6RVsA+Tdnb6JqC9c6AopmXvGI4XOchm70EXkcBr4LxE0gguviJlMkNcG4rdmPnq5e/81B8neXG4Rfiud8vdg8pFGvFbpGrX08cP+YEYVnjB5BwshqJr5kkes= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598957065355366.1844335450438; Tue, 1 Sep 2020 03:44:25 -0700 (PDT) Received: from localhost ([::1]:44548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD3m4-0002DG-Hd for importer@patchew.org; Tue, 01 Sep 2020 06:44:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD3ik-0004ra-P6; Tue, 01 Sep 2020 06:40:58 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:35777) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kD3ij-0001t5-9t; Tue, 01 Sep 2020 06:40:58 -0400 Received: by mail-wr1-x444.google.com with SMTP id e16so965817wrm.2; Tue, 01 Sep 2020 03:40:55 -0700 (PDT) Received: from localhost.localdomain (50.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.50]) by smtp.gmail.com with ESMTPSA id o9sm1541461wrw.58.2020.09.01.03.40.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 03:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/6T9K6cB8UVV4OMBVpNqFssF0Hs6NHMYQ4tqHB6tDmc=; b=rSkZ7X8kUrd1wGRYX5B7WFEO/QF4TYJ+3JQmfHKvkF6SXIFOP0HKs/VwAZhLJkq+nq EaqwAdc4qz9b8RLL9cP/PLn6uV4CDyumJ37k1+JTisKFb8jANR3kMGFkRQD+c71TVwUc mreOAALZDYEgOX440Hvhp7XgAR82yq+VAmpjh3WHQ3EhUcVZFZJzslPIb34dN1UbAbDS iG+HFx60g3ryQrHHAYkv2d9rqfDkGO4lm0XWctqK7bhu6gL8tZymJIUSbwueyKzB8Wc/ kvEJcJYi7PYw1Oi3umjGdc9VFxnyhIBWmwe1LCnJHuajdGQ7Hh19SkzLkSbFETc45WM9 8Sbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/6T9K6cB8UVV4OMBVpNqFssF0Hs6NHMYQ4tqHB6tDmc=; b=HcHzcnHSapCYCL/N2W2gXLi++i2hkNRfnLPbvie6ybSgqFfGGP5+eymhNW76gajzGe Y1Y6NRN/Vcl6Ww4Encn3PvA4wZfwyh6tvsVdn+CVG9inzYVxBKmYbRVAKjBJAK8aOVFF ft6wsFKSaQ7rzJ1R85vhPVGnnsyOFPiM6Shc10dbj4G2S8/vkLhYBStVhGgVUJ5tCSVP Ldoh0xR4I0JZAFtYbQkT+Q/W2EZ1GtN/1oaK2n6efwZa67XsjVXCrPj/uX4qUkGEZknh zkk4PMthsKZGXElDa5Y9rM7S7No+bJFjWiY9mSvN4URo7aFeI0Hk61Gp5nSoB9Rs5hLG /G7g== X-Gm-Message-State: AOAM530bB6VbQ6wpCt0CTH0BLnlEgQQSdOhHRh7BkguWYY/oezN9m26h 50X0qt8ajl1MrdGCkdYFe7lC13wtGdQ= X-Google-Smtp-Source: ABdhPJxyQyV0nXdaMnInamHSELiEe2+BOhW6gq7YYS31iXqk+TVi8a8hYpg2D/Ob+QWRsh/byW51cA== X-Received: by 2002:adf:eece:: with SMTP id a14mr1157824wrp.330.1598956854735; Tue, 01 Sep 2020 03:40:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 5/5] hw/isa/isa-bus: Replace hw_error() by assert() Date: Tue, 1 Sep 2020 12:40:43 +0200 Message-Id: <20200901104043.91383-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200901104043.91383-1-f4bug@amsat.org> References: <20200901104043.91383-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Peter Maydell , Aleksandar Rikalo , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Huacai Chen , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) As we can never have more than ISA_NUM_IRQS (16) ISA IRQs, replace the not very interesting hw_error() call by an assert() which is more useful to debug condition that can not happen. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/isa/isa-bus.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index 58fde178f92..10bb7ffa43a 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -21,7 +21,6 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/hw.h" #include "monitor/monitor.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" @@ -85,18 +84,14 @@ void isa_bus_irqs(ISABus *bus, qemu_irq *irqs) qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq) { assert(!dev || ISA_BUS(qdev_get_parent_bus(DEVICE(dev))) =3D=3D isabus= ); - if (isairq >=3D ISA_NUM_IRQS) { - hw_error("isa irq %d invalid", isairq); - } + assert(isairq < ISA_NUM_IRQS); return isabus->irqs[isairq]; } =20 void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq) { assert(dev->nirqs < ARRAY_SIZE(dev->isairq)); - if (isairq >=3D ISA_NUM_IRQS) { - hw_error("isa irq %d invalid", isairq); - } + assert(isairq < ISA_NUM_IRQS); dev->isairq[dev->nirqs] =3D isairq; *p =3D isa_get_irq(dev, isairq); dev->nirqs++; --=20 2.26.2