From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38737) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAOdM-0006rs-To for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RAOdM-0008F3-2A for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:20 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:34298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAOdL-0008Eq-Dm for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:20 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 2 Oct 2011 18:10:25 +0200 Message-Id: <1317571828-9059-14-git-send-email-hpoussin@reactos.org> In-Reply-To: <1317571828-9059-1-git-send-email-hpoussin@reactos.org> References: <1317571828-9059-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 13/16] isa: use bus given in parameter to get/set irqs on specified ISA bus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Signed-off-by: Herv=C3=A9 Poussineau --- hw/isa-bus.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 4a95834..2f9ad24 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -60,10 +60,11 @@ void isa_bus_new(ISABus *bus, ISABusOps *ops, DeviceS= tate *host) =20 void isa_bus_irqs(ISABus *bus, qemu_irq *irqs) { - if (!isabus || !isabus->ops->set_irqs) { + if (!bus || !bus->ops->set_irqs) { hw_error("Tried to set isa irqs with no isa bus present."); } - isabus->ops->set_irqs(isabus, irqs); + assert(bus =3D=3D isabus); + bus->ops->set_irqs(bus, irqs); } =20 /* @@ -74,10 +75,11 @@ void isa_bus_irqs(ISABus *bus, qemu_irq *irqs) */ qemu_irq isa_get_irq(ISABus *bus, int isairq) { - if (!isabus || !isabus->ops->get_irq) { + if (!bus || !bus->ops->get_irq) { hw_error("ISA bus invalid"); } - return isabus->ops->get_irq(isabus, isairq); + assert(bus =3D=3D isabus); + return bus->ops->get_irq(bus, isairq); } =20 void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq) --=20 1.7.6.3