[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/12] qdev: add isa_create() function
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 06/12] qdev: add isa_create() function |
Date: |
Wed, 9 Sep 2009 16:45:41 +0200 |
Like isa_create_simple, but doesn't call qdev_init, so one can set
properties after creating and before initializing the device.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/isa-bus.c | 15 +++++++++++++--
hw/isa.h | 1 +
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 3cc17b2..4ecc0f8 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -109,7 +109,7 @@ void isa_qdev_register(ISADeviceInfo *info)
qdev_register(&info->qdev);
}
-ISADevice *isa_create_simple(const char *name)
+ISADevice *isa_create(const char *name)
{
DeviceState *dev;
@@ -118,10 +118,21 @@ ISADevice *isa_create_simple(const char *name)
return NULL;
}
dev = qdev_create(&isabus->qbus, name);
- qdev_init(dev);
return DO_UPCAST(ISADevice, qdev, dev);
}
+ISADevice *isa_create_simple(const char *name)
+{
+ ISADevice *dev;
+
+ dev = isa_create(name);
+ if (qdev_init(&dev->qdev) != 0) {
+ qdev_free(&dev->qdev);
+ return NULL;
+ }
+ return dev;
+}
+
static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent)
{
ISADevice *d = DO_UPCAST(ISADevice, qdev, dev);
diff --git a/hw/isa.h b/hw/isa.h
index 4582ff9..655ad62 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -27,6 +27,7 @@ void isa_bus_irqs(qemu_irq *irqs);
qemu_irq isa_reserve_irq(int isairq);
void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);
void isa_qdev_register(ISADeviceInfo *info);
+ISADevice *isa_create(const char *name);
ISADevice *isa_create_simple(const char *name);
extern target_phys_addr_t isa_mem_base;
--
1.6.2.5
- [Qemu-devel] [PATCH 00/12] qdev isa patches., Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 05/12] qdev: tag isabus-bridge as no-user, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 02/12] isapc: pick a more sane default cpu for such old hardware., Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 01/12] isapc: Fix irq routing, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 03/12] qdev: drop iobase properties from isa bus, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 08/12] qdev/isa: convert cs4231a sound card, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 06/12] qdev: add isa_create() function,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 04/12] qdev: simplify isa irq assignments, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 07/12] qdev/isa: convert soundblaster, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 09/12] qdev/isa: convert gravis ultrasound, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 11/12] qdev/isa: finish pckbd conversion, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 10/12] qdev/isa: convert ne2000, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 12/12] qdev/isa: convert real time clock, Gerd Hoffmann, 2009/09/09