[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 16/16] isa: remove limitation of only one ISA bus
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v3 16/16] isa: remove limitation of only one ISA bus |
Date: |
Sun, 2 Oct 2011 18:10:28 +0200 |
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/isa-bus.c | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index ab8dbe9..f01dfb2 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -22,7 +22,6 @@
#include "isa.h"
#include "exec-memory.h"
-static ISABus *isabus;
target_phys_addr_t isa_mem_base = 0;
static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent);
@@ -50,12 +49,8 @@ ISABus *isa_bus_bridge_init(MemoryRegion *address_space_io)
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;
}
void isa_bus_irqs(ISABus *bus, qemu_irq *irqs)
@@ -63,7 +58,6 @@ void isa_bus_irqs(ISABus *bus, qemu_irq *irqs)
if (!bus || !bus->ops->set_irqs) {
hw_error("Tried to set isa irqs with no isa bus present.");
}
- assert(bus == isabus);
bus->ops->set_irqs(bus, irqs);
}
@@ -78,7 +72,6 @@ qemu_irq isa_get_irq(ISABus *bus, int isairq)
if (!bus || !bus->ops->get_irq) {
hw_error("ISA bus invalid");
}
- assert(bus == isabus);
return bus->ops->get_irq(bus, isairq);
}
@@ -119,7 +112,6 @@ void isa_register_ioport(ISADevice *dev, MemoryRegion *io,
uint16_t start)
{
ISABus *bus = isa_bus_from_device(dev);
- assert(bus == isabus);
if (!bus || !bus->ops->get_io_space) {
hw_error("Tried to register I/O port with no isa bus present.");
}
@@ -157,7 +149,6 @@ ISADevice *isa_create(ISABus *bus, const char *name)
hw_error("Tried to create isa device %s with no isa bus present.",
name);
}
- assert(bus == isabus);
dev = qdev_create(&bus->qbus, name);
return DO_UPCAST(ISADevice, qdev, dev);
}
@@ -170,7 +161,6 @@ ISADevice *isa_try_create(ISABus *bus, const char *name)
hw_error("Tried to create isa device %s with no isa bus present.",
name);
}
- assert(bus == isabus);
dev = qdev_try_create(&bus->qbus, name);
return DO_UPCAST(ISADevice, qdev, dev);
}
--
1.7.6.3
- [Qemu-devel] [PATCH v3 02/16] isa: rework ISA bus internals, and add ISA bus ops structure, (continued)
- [Qemu-devel] [PATCH v3 02/16] isa: rework ISA bus internals, and add ISA bus ops structure, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 04/16] audio: give ISA bus to sound cards, instead of PIC, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 05/16] pc: improve bus implementation of PIIX3 bridge, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 06/16] fulong2e: improve bus implementation of vt82c bridge, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 07/16] sun4u: improve bus implementation of EBus bridge, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 08/16] malta: improve bus implementation of PIIX4 bridge, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 09/16] isa: remove unused parameter to isa_bus_bridge_init(), Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 12/16] isa: give bus to isa_get_irq() and isa_bus_irqs(), Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 13/16] isa: use bus given in parameter to get/set irqs on specified ISA bus, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 15/16] isa: remove useless test in isa_register_ioport(), Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 16/16] isa: remove limitation of only one ISA bus,
Hervé Poussineau <=
- [Qemu-devel] [PATCH v3 14/16] i8259: add ad-hock variables to please future changes in isa_register_ioport(), Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 10/16] isa: give bus to isa_create() and isa_try_create() methods, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 11/16] isa: use bus given in parameter to create device on specified ISA bus, Hervé Poussineau, 2011/10/02