From nobody Mon Feb 9 19:55:18 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1634260879427638.5493535586791; Thu, 14 Oct 2021 18:21:19 -0700 (PDT) Received: from localhost ([::1]:34722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mbBuQ-0007CY-HP for importer@patchew.org; Thu, 14 Oct 2021 21:21:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbBqP-0000n2-CS for qemu-devel@nongnu.org; Thu, 14 Oct 2021 21:17:13 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:50161) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbBqN-00079R-Ng for qemu-devel@nongnu.org; Thu, 14 Oct 2021 21:17:09 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 2C3D1756072; Fri, 15 Oct 2021 03:17:05 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id CB7B7756057; Fri, 15 Oct 2021 03:16:57 +0200 (CEST) Message-Id: <228ffba872d7870392270b36910ac8250cd7ff96.1634259980.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 3/4] hw/usb/vt82c686-uhci-pci: Avoid using isa_get_irq() Date: Fri, 15 Oct 2021 03:06:20 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org X-Spam-Probability: 8% 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=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Huacai Chen , Gerd Hoffmann , Philippe M-D Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1634260881483100001 Content-Type: text/plain; charset="utf-8" Use via_isa_set_irq() which better encapsulates irq handling in the vt82xx model and avoids using isa_get_irq() that has a comment saying it should not be used. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/usb/vt82c686-uhci-pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/usb/vt82c686-uhci-pci.c b/hw/usb/vt82c686-uhci-pci.c index e70e739409..92479d11e5 100644 --- a/hw/usb/vt82c686-uhci-pci.c +++ b/hw/usb/vt82c686-uhci-pci.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/isa/vt82c686.h" #include "hcd-uhci.h" =20 static void uhci_isa_set_irq(void *opaque, int irq_num, int level) @@ -7,7 +8,7 @@ static void uhci_isa_set_irq(void *opaque, int irq_num, int= level) UHCIState *s =3D opaque; uint8_t irq =3D pci_get_byte(s->dev.config + PCI_INTERRUPT_LINE); if (irq > 0 && irq < 15) { - qemu_set_irq(isa_get_irq(NULL, irq), level); + via_isa_set_irq(pci_get_function_0(&s->dev), irq, level); } } =20 --=20 2.21.4