mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 08:13:54 -06:00
Merge branch 'realize-isa.v2' of git://github.com/afaerber/qemu-cpu
* 'realize-isa.v2' of git://github.com/afaerber/qemu-cpu: qdev: Drop FROM_QBUS() macro isa: QOM'ify ISADevice isa: QOM'ify ISABus i8259: Convert PICCommonState to use QOM realizefn kvm/i8259: QOM'ify some more i8259: QOM'ify some more i8254: Convert PITCommonState to QOM realizefn kvm/i8254: QOM'ify some more i8254: QOM'ify some more isa: Use realizefn for ISADevice cs4231a: QOM'ify some more gus: QOM'ify some more
This commit is contained in:
commit
371a775dc1
53 changed files with 533 additions and 389 deletions
|
@ -14,15 +14,17 @@
|
|||
/* parallel.c */
|
||||
static inline bool parallel_init(ISABus *bus, int index, CharDriverState *chr)
|
||||
{
|
||||
ISADevice *dev;
|
||||
DeviceState *dev;
|
||||
ISADevice *isadev;
|
||||
|
||||
dev = isa_try_create(bus, "isa-parallel");
|
||||
if (!dev) {
|
||||
isadev = isa_try_create(bus, "isa-parallel");
|
||||
if (!isadev) {
|
||||
return false;
|
||||
}
|
||||
qdev_prop_set_uint32(&dev->qdev, "index", index);
|
||||
qdev_prop_set_chr(&dev->qdev, "chardev", chr);
|
||||
if (qdev_init(&dev->qdev) < 0) {
|
||||
dev = DEVICE(isadev);
|
||||
qdev_prop_set_uint32(dev, "index", index);
|
||||
qdev_prop_set_chr(dev, "chardev", chr);
|
||||
if (qdev_init(dev) < 0) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
@ -155,18 +157,20 @@ int isa_vga_mm_init(hwaddr vram_base,
|
|||
/* ne2000.c */
|
||||
static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd)
|
||||
{
|
||||
ISADevice *dev;
|
||||
DeviceState *dev;
|
||||
ISADevice *isadev;
|
||||
|
||||
qemu_check_nic_model(nd, "ne2k_isa");
|
||||
|
||||
dev = isa_try_create(bus, "ne2k_isa");
|
||||
if (!dev) {
|
||||
isadev = isa_try_create(bus, "ne2k_isa");
|
||||
if (!isadev) {
|
||||
return false;
|
||||
}
|
||||
qdev_prop_set_uint32(&dev->qdev, "iobase", base);
|
||||
qdev_prop_set_uint32(&dev->qdev, "irq", irq);
|
||||
qdev_set_nic_properties(&dev->qdev, nd);
|
||||
qdev_init_nofail(&dev->qdev);
|
||||
dev = DEVICE(isadev);
|
||||
qdev_prop_set_uint32(dev, "iobase", base);
|
||||
qdev_prop_set_uint32(dev, "irq", irq);
|
||||
qdev_set_nic_properties(dev, nd);
|
||||
qdev_init_nofail(dev);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue