soundhw: unify initialization for ISA and PCI soundhw
Use qdev_new instead of distinguishing isa_create_simple/pci_create_simple. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
eef5fdf3d5
commit
bf521c5655
|
@ -114,25 +114,30 @@ void soundhw_init(void)
|
||||||
struct soundhw *c = selected;
|
struct soundhw *c = selected;
|
||||||
ISABus *isa_bus = (ISABus *) object_resolve_path_type("", TYPE_ISA_BUS, NULL);
|
ISABus *isa_bus = (ISABus *) object_resolve_path_type("", TYPE_ISA_BUS, NULL);
|
||||||
PCIBus *pci_bus = (PCIBus *) object_resolve_path_type("", TYPE_PCI_BUS, NULL);
|
PCIBus *pci_bus = (PCIBus *) object_resolve_path_type("", TYPE_PCI_BUS, NULL);
|
||||||
|
BusState *bus;
|
||||||
|
|
||||||
if (!c) {
|
if (!c) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (c->typename) {
|
|
||||||
warn_report("'-soundhw %s' is deprecated, "
|
|
||||||
"please use '-device %s' instead",
|
|
||||||
c->name, c->typename);
|
|
||||||
if (c->isa) {
|
if (c->isa) {
|
||||||
isa_create_simple(isa_bus, c->typename);
|
if (!isa_bus) {
|
||||||
} else {
|
error_report("ISA bus not available for %s", c->name);
|
||||||
pci_create_simple(pci_bus, -1, c->typename);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
bus = BUS(isa_bus);
|
||||||
} else {
|
} else {
|
||||||
assert(!c->isa);
|
|
||||||
if (!pci_bus) {
|
if (!pci_bus) {
|
||||||
error_report("PCI bus not available for %s", c->name);
|
error_report("PCI bus not available for %s", c->name);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
bus = BUS(pci_bus);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (c->typename) {
|
||||||
|
DeviceState *dev = qdev_new(c->typename);
|
||||||
|
qdev_realize_and_unref(dev, bus, &error_fatal);
|
||||||
|
} else {
|
||||||
|
assert(!c->isa);
|
||||||
c->init_pci(pci_bus);
|
c->init_pci(pci_bus);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue