提交 924f6d72 编写于 作者: G Gerd Hoffmann 提交者: malc

qdev: add isa_create() function

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: NGerd Hoffmann <kraxel@redhat.com>
上级 787aa97a
...@@ -109,7 +109,7 @@ void isa_qdev_register(ISADeviceInfo *info) ...@@ -109,7 +109,7 @@ void isa_qdev_register(ISADeviceInfo *info)
qdev_register(&info->qdev); qdev_register(&info->qdev);
} }
ISADevice *isa_create_simple(const char *name) ISADevice *isa_create(const char *name)
{ {
DeviceState *dev; DeviceState *dev;
...@@ -118,10 +118,21 @@ ISADevice *isa_create_simple(const char *name) ...@@ -118,10 +118,21 @@ ISADevice *isa_create_simple(const char *name)
return NULL; return NULL;
} }
dev = qdev_create(&isabus->qbus, name); dev = qdev_create(&isabus->qbus, name);
qdev_init(dev);
return DO_UPCAST(ISADevice, qdev, 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) static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent)
{ {
ISADevice *d = DO_UPCAST(ISADevice, qdev, dev); ISADevice *d = DO_UPCAST(ISADevice, qdev, dev);
......
...@@ -27,6 +27,7 @@ void isa_bus_irqs(qemu_irq *irqs); ...@@ -27,6 +27,7 @@ void isa_bus_irqs(qemu_irq *irqs);
qemu_irq isa_reserve_irq(int isairq); qemu_irq isa_reserve_irq(int isairq);
void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq); void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);
void isa_qdev_register(ISADeviceInfo *info); void isa_qdev_register(ISADeviceInfo *info);
ISADevice *isa_create(const char *name);
ISADevice *isa_create_simple(const char *name); ISADevice *isa_create_simple(const char *name);
extern target_phys_addr_t isa_mem_base; extern target_phys_addr_t isa_mem_base;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册