[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 09/11] isa: always use provided ISA bus when crea
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v3 09/11] isa: always use provided ISA bus when creating an isa device |
Date: |
Thu, 15 Dec 2011 22:09:59 +0100 |
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/isa-bus.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 7c94f0b..3207680 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -130,12 +130,11 @@ ISADevice *isa_create(ISABus *bus, const char *name)
{
DeviceState *dev;
- assert(!bus || bus == isabus);
- if (!isabus) {
+ if (!bus) {
hw_error("Tried to create isa device %s with no isa bus present.",
name);
}
- dev = qdev_create(&isabus->qbus, name);
+ dev = qdev_create(&bus->qbus, name);
return DO_UPCAST(ISADevice, qdev, dev);
}
@@ -143,12 +142,11 @@ ISADevice *isa_try_create(ISABus *bus, const char *name)
{
DeviceState *dev;
- assert(!bus || bus == isabus);
- 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);
+ dev = qdev_try_create(&bus->qbus, name);
return DO_UPCAST(ISADevice, qdev, dev);
}
--
1.7.7.3
- [Qemu-devel] [PATCH v3 00/11] isa: preliminary work for multiple buses, Hervé Poussineau, 2011/12/15
- [Qemu-devel] [PATCH v3 02/11] isa: move ISABus structure definition to header file, Hervé Poussineau, 2011/12/15
- [Qemu-devel] [PATCH v3 01/11] isa: give ISABus/ISADevice to isa_create(), isa_bus_irqs() and isa_get_irq() functions, Hervé Poussineau, 2011/12/15
- [Qemu-devel] [PATCH v3 03/11] i8259: give ISA device to isa_register_ioport(), Hervé Poussineau, 2011/12/15
- [Qemu-devel] [PATCH v3 04/11] pc: give ISA bus to ISA methods, Hervé Poussineau, 2011/12/15
- [Qemu-devel] [PATCH v3 05/11] alpha: give ISA bus to ISA methods, Hervé Poussineau, 2011/12/15
- [Qemu-devel] [PATCH v3 06/11] sun4u: give ISA bus to ISA methods, Hervé Poussineau, 2011/12/15
- [Qemu-devel] [PATCH v3 07/11] fulong2e: give ISA bus to ISA methods, Hervé Poussineau, 2011/12/15
- [Qemu-devel] [PATCH v3 08/11] malta: give ISA bus to ISA methods, Hervé Poussineau, 2011/12/15
- [Qemu-devel] [PATCH v3 10/11] isa: always use provided ISA bus in isa_bus_irqs(), Hervé Poussineau, 2011/12/15
- [Qemu-devel] [PATCH v3 09/11] isa: always use provided ISA bus when creating an isa device,
Hervé Poussineau <=
- [Qemu-devel] [PATCH v3 11/11] audio: remove unused parameter isa_pic, Hervé Poussineau, 2011/12/15
- Re: [Qemu-devel] [PATCH v3 00/11] isa: preliminary work for multiple buses, Anthony Liguori, 2011/12/20