diff options
| author | Martin Kletzander <mkletzan@redhat.com> | 2023-09-22 17:21:39 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-10-03 10:29:39 +0200 |
| commit | b8ab0303de5a72d89da5ab25d8fe817d8797888f (patch) | |
| tree | 0609ead6c7f95ccb566ff221369e3f7466077af0 /hw/arm/integratorcp.c | |
| parent | 7a2c7da6448eb8538bccbbc288508bde69bc4c2d (diff) | |
| download | focaccia-qemu-b8ab0303de5a72d89da5ab25d8fe817d8797888f.tar.gz focaccia-qemu-b8ab0303de5a72d89da5ab25d8fe817d8797888f.zip | |
hw/arm: Support machine-default audiodev with fallback
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/arm/integratorcp.c')
| -rw-r--r-- | hw/arm/integratorcp.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index b109ece3ae..d176e9af7e 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -27,6 +27,7 @@ #include "hw/irq.h" #include "hw/sd/sd.h" #include "qom/object.h" +#include "audio/audio.h" #define TYPE_INTEGRATOR_CM "integrator_core" OBJECT_DECLARE_SIMPLE_TYPE(IntegratorCMState, INTEGRATOR_CM) @@ -660,7 +661,13 @@ static void integratorcp_init(MachineState *machine) &error_fatal); } - sysbus_create_varargs("pl041", 0x1d000000, pic[25], NULL); + dev = qdev_new("pl041"); + if (machine->audiodev) { + qdev_prop_set_string(dev, "audiodev", machine->audiodev); + } + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0x1d000000); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[25]); if (nd_table[0].used) smc91c111_init(&nd_table[0], 0xc8000000, pic[27]); @@ -678,6 +685,8 @@ static void integratorcp_machine_init(MachineClass *mc) mc->ignore_memory_transaction_failures = true; mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926"); mc->default_ram_id = "integrator.ram"; + + machine_add_audiodev_property(mc); } DEFINE_MACHINE("integratorcp", integratorcp_machine_init) |