From patchwork Mon Oct 24 20:18:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 121429 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 966261007D7 for ; Tue, 25 Oct 2011 09:02:15 +1100 (EST) Received: from localhost ([::1]:45555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIQzk-0004bL-3T for incoming@patchwork.ozlabs.org; Mon, 24 Oct 2011 16:19:40 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIQyc-0002Uv-Ty for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:18:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RIQyL-0001ZP-LA for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:18:16 -0400 Received: from smtp23.services.sfr.fr ([93.17.128.19]:58040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIQyL-0001Yi-7D for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:18:13 -0400 Received: from filter.sfr.fr (localhost [127.0.0.1]) by msfrf2304.sfr.fr (SMTP Server) with ESMTP id E3C467000043; Mon, 24 Oct 2011 22:18:12 +0200 (CEST) Received: from localhost.localdomain (unknown [92.90.16.152]) by msfrf2304.sfr.fr (SMTP Server) with ESMTP id 6D7DD70000EC; Mon, 24 Oct 2011 22:18:12 +0200 (CEST) X-SFR-UUID: 20111024201812448.6D7DD70000EC@msfrf2304.sfr.fr From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Mon, 24 Oct 2011 22:18:24 +0200 Message-Id: <1319487505-5915-11-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.7.6.3 In-Reply-To: <1319487505-5915-1-git-send-email-hpoussin@reactos.org> References: <1319487505-5915-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 93.17.128.19 Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [PATCH 10/11] isa: always use provided ISA bus in isa_bus_irqs() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Hervé Poussineau --- hw/isa-bus.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 3207680..5af790b 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -53,8 +53,10 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space_io) void isa_bus_irqs(ISABus *bus, qemu_irq *irqs) { - assert(!bus || bus == isabus); - isabus->irqs = irqs; + if (!bus) { + hw_error("Can't set isa irqs with no isa bus present."); + } + bus->irqs = irqs; } /*