[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 11/16] isa: use bus given in parameter to create
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v3 11/16] isa: use bus given in parameter to create device on specified ISA bus |
Date: |
Sun, 2 Oct 2011 18:10:23 +0200 |
Signed-off-by: Hervé Poussineau <address@hidden>
---
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 ecc5375..cdfed29 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -151,11 +151,12 @@ ISADevice *isa_create(ISABus *bus, const char *name)
{
DeviceState *dev;
- if (!isabus) {
+ if (!bus) {
hw_error("Tried to create isa device %s with no isa bus present.",
name);
}
- dev = qdev_create(&isabus->qbus, name);
+ assert(bus == isabus);
+ dev = qdev_create(&bus->qbus, name);
return DO_UPCAST(ISADevice, qdev, dev);
}
@@ -163,11 +164,12 @@ ISADevice *isa_try_create(ISABus *bus, const char *name)
{
DeviceState *dev;
- if (!isabus) {
+ if (!bus) {
hw_error("Tried to create isa device %s with no isa bus present.",
name);
}
- dev = qdev_try_create(&isabus->qbus, 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 06/16] fulong2e: improve bus implementation of vt82c bridge, (continued)
- [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, 2011/10/02
- [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 <=