All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Hervé Poussineau" <hpoussin@reactos.org>
To: qemu-devel@nongnu.org
Cc: "Anthony Liguori" <aliguori@us.ibm.com>,
	"Hervé Poussineau" <hpoussin@reactos.org>
Subject: [Qemu-devel] [PATCH 10/11] isa: always use provided ISA bus in isa_bus_irqs()
Date: Thu, 15 Dec 2011 00:02:42 +0100	[thread overview]
Message-ID: <1323903763-22933-11-git-send-email-hpoussin@reactos.org> (raw)
In-Reply-To: <1323903763-22933-1-git-send-email-hpoussin@reactos.org>


Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 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;
 }
 
 /*
-- 
1.7.7.3

  parent reply	other threads:[~2011-12-14 23:02 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-14 23:02 [Qemu-devel] [PATCH v2 00/11] isa: preliminary work for multiple buses Hervé Poussineau
2011-12-14 23:02 ` [Qemu-devel] [PATCH 01/11] isa: give ISABus/ISADevice to isa_create(), isa_bus_irqs() and isa_get_irq() functions Hervé Poussineau
2011-12-14 23:02 ` [Qemu-devel] [PATCH 02/11] isa: move ISABus structure definition to header file Hervé Poussineau
2011-12-14 23:02 ` [Qemu-devel] [PATCH 03/11] i8259: give ISA device to isa_register_ioport() Hervé Poussineau
2011-12-14 23:02 ` [Qemu-devel] [PATCH 04/11] pc: give ISA bus to ISA methods Hervé Poussineau
2011-12-14 23:02 ` [Qemu-devel] [PATCH 05/11] alpha: " Hervé Poussineau
2011-12-14 23:02 ` [Qemu-devel] [PATCH 06/11] sun4u: " Hervé Poussineau
2011-12-14 23:02 ` [Qemu-devel] [PATCH 07/11] fulong2e: " Hervé Poussineau
2011-12-14 23:02 ` [Qemu-devel] [PATCH 08/11] malta: " Hervé Poussineau
2011-12-14 23:02 ` [Qemu-devel] [PATCH 09/11] isa: always use provided ISA bus when creating an isa device Hervé Poussineau
2011-12-14 23:02 ` Hervé Poussineau [this message]
2011-12-14 23:02 ` [Qemu-devel] [PATCH 11/11] audio: remove unused parameter isa_pic Hervé Poussineau
2011-12-15  1:17 ` [Qemu-devel] [PATCH v2 00/11] isa: preliminary work for multiple buses Anthony Liguori
  -- strict thread matches above, loose matches on Subject: below --
2011-10-24 20:18 [Qemu-devel] [PATCH " Hervé Poussineau
2011-10-24 20:18 ` [Qemu-devel] [PATCH 10/11] isa: always use provided ISA bus in isa_bus_irqs() Hervé Poussineau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1323903763-22933-11-git-send-email-hpoussin@reactos.org \
    --to=hpoussin@reactos.org \
    --cc=aliguori@us.ibm.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.