hw/ppc: Support machine-default audiodev with fallback
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
b8ab0303de
commit
2b16397264
@ -45,6 +45,7 @@
|
||||
#include "trace.h"
|
||||
#include "elf.h"
|
||||
#include "qemu/units.h"
|
||||
#include "audio/audio.h"
|
||||
|
||||
/* SMP is not enabled, for now */
|
||||
#define MAX_CPUS 1
|
||||
@ -310,6 +311,10 @@ static void ibm_40p_init(MachineState *machine)
|
||||
dev = DEVICE(isa_dev);
|
||||
qdev_prop_set_uint32(dev, "iobase", 0x830);
|
||||
qdev_prop_set_uint32(dev, "irq", 10);
|
||||
|
||||
if (machine->audiodev) {
|
||||
qdev_prop_set_string(dev, "audiodev", machine->audiodev);
|
||||
}
|
||||
isa_realize_and_unref(isa_dev, isa_bus, &error_fatal);
|
||||
|
||||
isa_dev = isa_new("pc87312");
|
||||
@ -426,6 +431,8 @@ static void ibm_40p_machine_init(MachineClass *mc)
|
||||
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("604");
|
||||
mc->default_display = "std";
|
||||
mc->default_nic = "pcnet";
|
||||
|
||||
machine_add_audiodev_property(mc);
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("40p", ibm_40p_machine_init)
|
||||
|
Loading…
Reference in New Issue
Block a user