From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Martin Kletzander <mkletzan@redhat.com>
Subject: [PULL 21/24] hw/ppc: Support machine-default audiodev with fallback
Date: Tue, 3 Oct 2023 10:30:38 +0200 [thread overview]
Message-ID: <20231003083042.110065-22-pbonzini@redhat.com> (raw)
In-Reply-To: <20231003083042.110065-1-pbonzini@redhat.com>
From: Martin Kletzander <mkletzan@redhat.com>
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/ppc/prep.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index f6fd35fcb9e..137276bcb92 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -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)
--
2.41.0
next prev parent reply other threads:[~2023-10-03 8:33 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-03 8:30 [PULL 00/24] Audio, build system, misc fixes for 2023-10-03 Paolo Bonzini
2023-10-03 8:30 ` [PULL 01/24] optionrom: Remove build-id section Paolo Bonzini
2023-10-03 10:04 ` Michael Tokarev
2023-10-03 8:30 ` [PULL 02/24] accel/kvm/kvm-all: Handle register access errors Paolo Bonzini
2023-10-03 8:30 ` [PULL 03/24] e1000: remove old compatibility code Paolo Bonzini
2023-10-03 8:30 ` [PULL 04/24] pc: remove short_root_bus property Paolo Bonzini
2023-10-03 8:30 ` [PULL 05/24] make-release: do not ship dtc sources Paolo Bonzini
2023-10-03 8:30 ` [PULL 06/24] meson: clean up static_library keyword arguments Paolo Bonzini
2023-10-03 8:30 ` [PULL 07/24] Makefile: build plugins before running TCG tests Paolo Bonzini
2023-10-03 8:30 ` [PULL 08/24] esp: use correct type for esp_dma_enable() in sysbus_esp_gpio_demux() Paolo Bonzini
2023-10-03 8:30 ` [PULL 09/24] esp: restrict non-DMA transfer length to that of available data Paolo Bonzini
2023-10-03 8:30 ` [PULL 10/24] scsi-disk: ensure that FORMAT UNIT commands are terminated Paolo Bonzini
2023-10-03 8:30 ` [PULL 11/24] crypto: only include tls-cipher-suites in emulators Paolo Bonzini
2023-10-03 8:30 ` [PULL 12/24] ui/vnc: Require audiodev= to enable audio Paolo Bonzini
2023-10-03 8:30 ` [PULL 13/24] audio: Require AudioState in AUD_add_capture Paolo Bonzini
2023-10-03 8:30 ` [PULL 14/24] audio: allow returning an error from the driver init Paolo Bonzini
2023-10-03 8:30 ` [PULL 15/24] audio: return Error ** from audio_state_by_name Paolo Bonzini
2023-10-03 8:30 ` [PULL 16/24] audio: commonize voice initialization Paolo Bonzini
2023-10-03 8:30 ` [PULL 17/24] audio: simplify flow in audio_init Paolo Bonzini
2023-10-03 8:30 ` [PULL 18/24] audio: remove QEMU_AUDIO_* and -audio-help support Paolo Bonzini
2023-10-03 8:30 ` [PULL 19/24] Introduce machine property "audiodev" Paolo Bonzini
2023-10-03 8:30 ` [PULL 20/24] hw/arm: Support machine-default audiodev with fallback Paolo Bonzini
2023-10-03 8:30 ` Paolo Bonzini [this message]
2023-10-03 8:30 ` [PULL 22/24] vt82c686 machines: " Paolo Bonzini
2023-10-03 8:30 ` [PULL 23/24] audio: propagate Error * out of audio_init Paolo Bonzini
2023-10-03 8:30 ` [PULL 24/24] audio: forbid default audiodev backend with -nodefaults Paolo Bonzini
2023-10-03 14:43 ` [PULL 00/24] Audio, build system, misc fixes for 2023-10-03 Stefan Hajnoczi
2023-10-03 15:36 ` Michael Tokarev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231003083042.110065-22-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=mkletzan@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).