qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Hervé Poussineau" <hpoussin@reactos.org>
To: qemu-devel@nongnu.org
Cc: "Hervé Poussineau" <hpoussin@reactos.org>
Subject: [Qemu-devel] [PATCH 11/11] isa: remove limitation of only one ISA bus
Date: Sun, 18 Sep 2011 16:56:43 +0200	[thread overview]
Message-ID: <1316357803-2366-12-git-send-email-hpoussin@reactos.org> (raw)
In-Reply-To: <1316357803-2366-1-git-send-email-hpoussin@reactos.org>

Default ISA bus will be the first created

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/isa-bus.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index b697f65..9e668ef 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -45,12 +45,11 @@ ISABus *isa_bus_bridge_init(void)
 
 void isa_bus_new(ISABus *bus, ISABusOps *ops, DeviceState *host)
 {
-    if (isabus) {
-        hw_error("Can't create a second ISA bus");
-    }
     qbus_create_inplace(&bus->qbus, &isa_bus_info, host, NULL);
     bus->ops = ops;
-    isabus = bus;
+    if (!isabus) {
+        isabus = bus;
+    }
 }
 
 void isa_bus_irqs(qemu_irq *irqs)
-- 
1.7.5.4

  parent reply	other threads:[~2011-09-18 14:57 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-18 14:56 [Qemu-devel] [PATCH 00/11] ISA bus improvements Hervé Poussineau
2011-09-18 14:56 ` [Qemu-devel] [PATCH 01/11] isa: rename isa_bus_new to isa_bus_bridge_init Hervé Poussineau
2011-09-18 14:56 ` [Qemu-devel] [PATCH 02/11] isa: rework ISA bus internals, and add ISA bus ops structure Hervé Poussineau
2011-09-18 14:56 ` [Qemu-devel] [PATCH 03/11] isa: implement isa_address_space() as a method of ISA bus Hervé Poussineau
2011-09-18 14:56 ` [Qemu-devel] [PATCH 04/11] audio: give ISA bus to sound cards, instead of PIC Hervé Poussineau
2011-09-18 14:56 ` [Qemu-devel] [PATCH 05/11] pc: improve bus implementation of PIIX3 bridge Hervé Poussineau
2011-09-18 14:56 ` [Qemu-devel] [PATCH 06/11] fulong2e: move pic initialization + ISA bus creation to south bridge Hervé Poussineau
2011-09-18 14:56 ` [Qemu-devel] [PATCH 07/11] sun4u: improve bus implementation of EBus bridge Hervé Poussineau
2011-09-18 14:56 ` [Qemu-devel] [PATCH 08/11] malta: improve bus implementation of PIIX4 bridge Hervé Poussineau
2011-09-18 14:56 ` [Qemu-devel] [PATCH 09/11] isa: remove unused parameter to isa_bus_bridge_init() Hervé Poussineau
2011-09-18 14:56 ` [Qemu-devel] [PATCH 10/11] isa: give bus to isa_create() methods Hervé Poussineau
2011-09-18 14:56 ` Hervé Poussineau [this message]
2011-09-18 19:21 ` [Qemu-devel] [PATCH 00/11] ISA bus improvements Jan Kiszka
2011-09-18 19:33   ` 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=1316357803-2366-12-git-send-email-hpoussin@reactos.org \
    --to=hpoussin@reactos.org \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).