From nobody Mon Feb 9 19:06:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621374975; cv=none; d=zohomail.com; s=zohoarc; b=kA4IXpNyIcoSPUrcgX/TbsqD4p2IQgRgdox4Xa6Vl8I4pUfh6BpFRHh6nfbVTnpAk7WrGj36OxJFO91s0bKs3uJ+BnD5TcYqZ/Rv9NakMncUUE3X60opxztu2xMEZ+FQckk0QZPBemHNzr/Ng5HnPlrolKclrqgETBcQPfRFkGo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621374975; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Z2jo9vllxtRVdXYudVjnDuNUHTkF+iLAh9lZ9RqOdvs=; b=ZpFhVgsEF1oy87+oYYdNjBBjBiqM+ImwTjlxylF3K/fY2I7rcSV9O1xI3hjEbjDkrARN62YEFOXvx05fCnO2L7+6M2qe9eiNTHerpwatqY1WFW2Pkvm3VWLBVFFkP71tWWCjpKuedZVnIcS2djhm8DEWW1ewji324f/24HrvIlQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1621374975929318.9289426010271; Tue, 18 May 2021 14:56:15 -0700 (PDT) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-306-XzuNgCorO3qAuPC5K0SfHQ-1; Tue, 18 May 2021 17:56:13 -0400 Received: by mail-ed1-f71.google.com with SMTP id ba15-20020a0564021acfb029038d3b33d7ffso3821140edb.23 for ; Tue, 18 May 2021 14:56:13 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id zg18sm3285496ejb.41.2021.05.18.14.56.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 14:56:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621374974; 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: in-reply-to:in-reply-to:references:references; bh=Z2jo9vllxtRVdXYudVjnDuNUHTkF+iLAh9lZ9RqOdvs=; b=IWdMDScKb0jChd25+B3kMU1TpPKm6Gmzzqa0bVQtdCDyBYMyJIkXn1Uz876x3rbyd4G7Oc V/n+WQ3X2iXQMixb0dvpI9BvCbagD0DwQcfRkF2z+mp8vQR09KmdfTrKrw+rIDIM/PNEjb dgTX/KE+bbpOS33JKhl9exXlw7du/Jg= X-MC-Unique: XzuNgCorO3qAuPC5K0SfHQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z2jo9vllxtRVdXYudVjnDuNUHTkF+iLAh9lZ9RqOdvs=; b=lFsh01A/gW362WhEemom0aTEHvt+NdhlC5qTxjZzm74JvCVBn+qkBIrJT9DV4XewMt efntDfo1LelrBt6K35h/pdsFag4yor/v36jys5juaiUTDZTEVaX8EShm0pCXts114m9S grgQ7/wMBkUQuqEkNZYwfniOSCDpX3LLaEN6AM3tzWPuo5fJvak2SkzoNiGBxs/KGivw kemh5Aikm8L0mWmq4JiyjCPK1nbM4AFXk6rZlZqLBjYf9P7zqMNs3AfYFhX/nVS4PyKi sIBzUsJi9CW3RsMaHe+x3ATUVRdo9/CeW1yVa5cElxEV31hz74P2OJ5pLhISY2NY9G/T JrZQ== X-Gm-Message-State: AOAM5316fjZQXOfVLklCgzH/pwyWc8ePITmbm28vqoDNF02fBssuoQOo zhHi6/0adFcc8yKDinVgaJkJt3DwjjtdElUuAaCNC2d2ZpzTTOqXML2vv8bTZTZOp2a5kCl0Tk0 rUSmDtFLMP4P1Cw== X-Received: by 2002:a17:906:3883:: with SMTP id q3mr8088483ejd.4.1621374971381; Tue, 18 May 2021 14:56:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfQFpA9LNFzEWOM0TFjIGwruGLe+BynHlo8AVtNrc5Ezqha8EVgrLfergrXNZHXSj1iFpn3w== X-Received: by 2002:a17:906:3883:: with SMTP id q3mr8088468ejd.4.1621374971251; Tue, 18 May 2021 14:56:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Snow , qemu-devel@nongnu.org Cc: Elena Ufimtseva , Markus Armbruster , Mark Cave-Ayland , Stefan Hajnoczi , Jagannathan Raman , Thomas Huth , John G Johnson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 05/11] hw/isa: Extract isa_bus_get_irq() from isa_get_irq() Date: Tue, 18 May 2021 23:55:39 +0200 Message-Id: <20210518215545.1793947-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518215545.1793947-1-philmd@redhat.com> References: <20210518215545.1793947-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) isa_get_irq() takes an ISADevice argument mostly to resolve the ISA bus. Extract the bus logic to isa_bus_get_irq(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/isa/isa.h | 1 + hw/isa/isa-bus.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index ddaae89a853..fd8b84d8007 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -91,6 +91,7 @@ struct ISADevice { ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space, MemoryRegion *address_space_io, Error **errp); void isa_bus_irqs(ISABus *bus, qemu_irq *irqs); +qemu_irq isa_bus_get_irq(ISABus *bus, unsigned isairq); qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq); void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq); void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq); diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index 7820068e6e1..b946e6dc478 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -75,6 +75,12 @@ void isa_bus_irqs(ISABus *bus, qemu_irq *irqs) bus->irqs =3D irqs; } =20 +qemu_irq isa_bus_get_irq(ISABus *bus, unsigned isairq) +{ + assert(isairq < ISA_NUM_IRQS); + return bus->irqs[isairq]; +} + /* * isa_get_irq() returns the corresponding qemu_irq entry for the i8259. * @@ -84,8 +90,7 @@ 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= ); - assert(isairq < ISA_NUM_IRQS); - return isabus->irqs[isairq]; + return isa_bus_get_irq(isabus, isairq); } =20 void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq) --=20 2.26.3