Audio, build system, misc fixes for 2023-10-03
The following changes since commit 36e9aab3c569d4c9ad780473596e18479838d1aa:
migration: Move return path cleanup to main migration thread (2023-09-27 13:58:02 -0400)
are available in the Git repository at:
https://gitlab.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to 9f8cf356723702272af124e621e4c0e9805c8e22:
audio: forbid default audiodev backend with -nodefaults (2023-10-03 10:29:40 +0200)
----------------------------------------------------------------
* fix from optionrom build
* fix for KVM on Apple M2
* introduce machine property "audiodev"
* ui/vnc: Require audiodev= to enable audio
* audio: remove QEMU_AUDIO_* and -audio-help support
* audio: forbid using default audiodev backend with -audiodev and -nodefaults
* remove compatibility code for old machine types
* make-release: do not ship dtc sources
* build system cleanups
----------------------------------------------------------------
Akihiko Odaki (1):
accel/kvm/kvm-all: Handle register access errors
Fabiano Rosas (1):
optionrom: Remove build-id section
Mark Cave-Ayland (3):
esp: use correct type for esp_dma_enable() in sysbus_esp_gpio_demux()
esp: restrict non-DMA transfer length to that of available data
scsi-disk: ensure that FORMAT UNIT commands are terminated
Martin Kletzander (5):
audio: Require AudioState in AUD_add_capture Introduce machine property "audiodev" hw/arm: Support machine-default audiodev with fallback hw/ppc: Support machine-default audiodev with fallback
audio: propagate Error * out of audio_init
Paolo Bonzini (14):
e1000: remove old compatibility code
pc: remove short_root_bus property
make-release: do not ship dtc sources
meson: clean up static_library keyword arguments
Makefile: build plugins before running TCG tests
crypto: only include tls-cipher-suites in emulators ui/vnc: Require audiodev= to enable audio
audio: allow returning an error from the driver init
audio: return Error ** from audio_state_by_name
audio: commonize voice initialization
audio: simplify flow in audio_init
audio: remove QEMU_AUDIO_* and -audio-help support vt82c686 machines: Support machine-default audiodev with fallback
audio: forbid default audiodev backend with -nodefaults
accel/kvm/kvm-all.c | 32 ++- audio/alsaaudio.c | 3 +- audio/audio-hmp-cmds.c | 6 +- audio/audio.c | 246 ++++++++-------- audio/audio.h | 7 +- audio/audio_int.h | 7 +- audio/audio_legacy.c | 591 --------------------------------------- audio/audio_template.h | 9 +- audio/coreaudio.m | 3 +- audio/dbusaudio.c | 3 +- audio/dsoundaudio.c | 3 +- audio/jackaudio.c | 3 +- audio/meson.build | 1 - audio/noaudio.c | 3 +- audio/ossaudio.c | 12 +- audio/paaudio.c | 8 +- audio/pwaudio.c | 17 +- audio/sdlaudio.c | 6 +- audio/sndioaudio.c | 3 +- audio/spiceaudio.c | 5 +- audio/wavaudio.c | 3 +- crypto/meson.build | 3 +- docs/about/deprecated.rst | 16 +- docs/about/removed-features.rst | 12 + gdbstub/meson.build | 4 +- hw/arm/integratorcp.c | 11 +- hw/arm/musicpal.c | 11 +- hw/arm/nseries.c | 4 + hw/arm/omap2.c | 7 +- hw/arm/palm.c | 2 + hw/arm/realview.c | 12 + hw/arm/spitz.c | 17 +- hw/arm/versatilepb.c | 8 + hw/arm/vexpress.c | 5 + hw/arm/xlnx-zcu102.c | 6 + hw/arm/z2.c | 15 +- hw/audio/ac97.c | 6 +- hw/audio/adlib.c | 6 +- hw/audio/cs4231a.c | 6 +- hw/audio/es1370.c | 5 +- hw/audio/gus.c | 6 +- hw/audio/hda-codec.c | 5 +- hw/audio/lm4549.c | 8 +- hw/audio/pcspk.c | 4 +- hw/audio/sb16.c | 6 +- hw/audio/via-ac97.c | 6 +- hw/audio/wm8750.c | 5 +- hw/core/machine.c | 33 +++ hw/core/qdev-properties-system.c | 16 +- hw/display/xlnx_dp.c | 6 +- hw/input/tsc210x.c | 7 +- hw/mips/fuloong2e.c | 15 +- hw/net/e1000.c | 79 ++---- hw/nvram/meson.build | 6 +- hw/pci-host/i440fx.c | 8 - hw/pci-host/q35.c | 7 - hw/ppc/pegasos2.c | 12 +- hw/ppc/prep.c | 7 + hw/scsi/esp.c | 5 +- hw/scsi/scsi-disk.c | 4 + hw/usb/dev-audio.c | 5 +- include/hw/boards.h | 9 + include/hw/pci-host/q35.h | 1 - meson.build | 14 +- pc-bios/optionrom/Makefile | 2 +- qemu-options.hx | 10 - scripts/archive-source.sh | 2 +- scripts/make-release | 2 +- softmmu/vl.c | 8 +- tcg/meson.build | 4 +- tests/Makefile.include | 2 +- tests/meson.build | 5 +- tests/plugin/meson.build | 18 +- ui/dbus.c | 3 +- ui/vnc.c | 14 +- ui/vnc.h | 2 + 76 files changed, 515 insertions(+), 958 deletions(-) delete mode 100644 audio/audio_legacy.c
Signature · 1 line
2.41.0
[PULL 01/24] optionrom: Remove build-id section
From: Fabiano Rosas <[email protected]>
Our linker script for optionroms specifies only the placement of the .text section, leaving the linker free to place the remaining sections at arbitrary places in the file.
Since at least binutils 2.39, the .note.gnu.build-id section is now being placed at the start of the file, which causes label addresses to be shifted. For linuxboot_dma.bin that means that the PnP header (among others) will not be found when determining the type of ROM at optionrom_setup():
(0x1c is the label _pnph, where the magic "PnP" is)
$ xxd /usr/share/qemu/linuxboot_dma.bin | grep "PnP" 00000010: 0000 0000 0000 0000 0000 1c00 2450 6e50 ............$PnP
$ xxd pc-bios/optionrom/linuxboot_dma.bin | grep "PnP"
00000010: 0000 0000 0000 0000 0000 4c00 2450 6e50 ............$PnP
^badUsing a freshly built linuxboot_dma.bin ROM results in a broken boot:
SeaBIOS (version rel-1.16.2-0-gea1b7a073390-prebuilt.qemu.org) Booting from Hard Disk...
Boot failed: could not read the boot disk
Booting from Floppy...
Boot failed: could not read the boot disk
No bootable device.
We're not using the build-id section, so pass the --build-id=none option to the linker to remove it entirely.
Note: In theory, this same issue could happen with any other section. The ideal solution would be to have all unused sections discarded in the linker script. However that would be a larger change, specially for the pvh rom which uses the .bss and COMMON sections so I'm addressing only the immediate issue here.
Message-ID: <[email protected]>
--- pc-bios/optionrom/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
pc-bios/optionrom/Makefile +1 -1
@@ -36,7 +36,7 @@ config-cc.mak: Makefile $(call cc-option,-Wno-array-bounds)) 3> config-cc.mak -include config-cc.mak -override LDFLAGS = -nostdlib -Wl,-T,$(SRC_DIR)/flat.lds +override LDFLAGS = -nostdlib -Wl,--build-id=none,-T,$(SRC_DIR)/flat.lds pvh.img: pvh.o pvh_main.o
Signature · 1 line
2.41.0
Re: [PULL 01/24] optionrom: Remove build-id section
Quoted 5 lines · Paolo Bonzini
From: Fabiano Rosas <[email protected]>
Our linker script for optionroms specifies only the placement of the .text section, leaving the linker free to place the remaining sections at arbitrary places in the file.
..
Quoted 1 line
Are you sure you mean *that* stable? :)
/mjt
[PULL 06/24] meson: clean up static_library keyword arguments
In reply to Paolo BonziniThese are either built because they are dependencies of other targets, or not needed at all because they are used via extract_objects(). Mark them as "build_by_default: false"; if applicable, mark them as "fa" so that -Wl,--whole-archive does not interact with the linker script used for fuzzing.
(The "fa" hack is brittle; updating to Meson 1.1 would allow using declare_dependency(objects: ...) instead).
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1044
--- gdbstub/meson.build | 4 ++-- meson.build | 11 +++++++---- tcg/meson.build | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-)
gdbstub/meson.build +2 -2
@@ -21,12 +21,12 @@ libgdb_user = static_library('gdb_user', gdb_user_ss.sources() + genh, name_suffix: 'fa', c_args: '-DCONFIG_USER_ONLY', - build_by_default: have_user) + build_by_default: false) libgdb_softmmu = static_library('gdb_softmmu', gdb_system_ss.sources() + genh, name_suffix: 'fa', - build_by_default: have_system) + build_by_default: false) gdb_user = declare_dependency(link_whole: libgdb_user) user_ss.add(gdb_user)
meson.build +7 -4
@@ -3180,7 +3180,6 @@ foreach d : hx_headers input: files(d[0]), output: d[1], capture: true, - build_by_default: true, # to be removed when added to a target command: [hxtool, '-h', '@INPUT0@']) endforeach genh += hxdep
@@ -3366,12 +3365,15 @@ endif qom_ss = qom_ss.apply(config_targetos, strict: false) libqom = static_library('qom', qom_ss.sources() + genh, dependencies: [qom_ss.dependencies()], - name_suffix: 'fa') + name_suffix: 'fa', + build_by_default: false) qom = declare_dependency(link_whole: libqom) event_loop_base = files('event-loop-base.c') -event_loop_base = static_library('event-loop-base', sources: event_loop_base + genh, - build_by_default: true) +event_loop_base = static_library('event-loop-base', + sources: event_loop_base + genh, + name_suffix: 'fa', + build_by_default: false) event_loop_base = declare_dependency(link_whole: event_loop_base, dependencies: [qom])
@@ -3380,6 +3382,7 @@ stub_ss = stub_ss.apply(config_all, strict: false) util_ss.add_all(trace_ss) util_ss = util_ss.apply(config_all, strict: false) libqemuutil = static_library('qemuutil', + build_by_default: false, sources: util_ss.sources() + stub_ss.sources() + genh, dependencies: [util_ss.dependencies(), libm, threads, glib, socket, malloc, pixman]) qemuutil = declare_dependency(link_with: libqemuutil,
tcg/meson.build +2 -2
@@ -28,7 +28,7 @@ libtcg_user = static_library('tcg_user', tcg_ss.sources() + genh, name_suffix: 'fa', c_args: '-DCONFIG_USER_ONLY', - build_by_default: have_user) + build_by_default: false) tcg_user = declare_dependency(link_with: libtcg_user, dependencies: tcg_ss.dependencies())
@@ -38,7 +38,7 @@ libtcg_softmmu = static_library('tcg_softmmu', tcg_ss.sources() + genh, name_suffix: 'fa', c_args: '-DCONFIG_SOFTMMU', - build_by_default: have_system) + build_by_default: false) tcg_softmmu = declare_dependency(link_with: libtcg_softmmu, dependencies: tcg_ss.dependencies())
Signature · 1 line
2.41.0
[PULL 10/24] scsi-disk: ensure that FORMAT UNIT commands are terminated
In reply to Paolo BonziniFrom: Mark Cave-Ayland <[email protected]>
Otherwise when a FORMAT UNIT command is issued, the SCSI layer can become confused because it can find itself in the situation where it thinks there is still data to be transferred which can cause the next emulated SCSI command to fail.
Message-ID: <[email protected]>
--- hw/scsi/scsi-disk.c | 4 ++++ 1 file changed, 4 insertions(+)
hw/scsi/scsi-disk.c +4 -0
@@ -1959,6 +1959,10 @@ static void scsi_disk_emulate_write_data(SCSIRequest *req)scsi_disk_emulate_write_same (r, r->iov.iov_base);break ; +case FORMAT_UNIT : +scsi_req_complete (&r->req,GOOD ); +break ; +default :abort (); }
Signature · 1 line
2.41.0
[PULL 15/24] audio: return Error ** from audio_state_by_name
In reply to Paolo BonziniRemove duplicate error formatting code.
--- audio/audio-hmp-cmds.c | 6 ++++-- audio/audio.c | 3 ++- audio/audio.h | 2 +- hw/core/qdev-properties-system.c | 16 ++++------------ ui/dbus.c | 3 +-- ui/vnc.c | 3 +-- 6 files changed, 13 insertions(+), 20 deletions(-)
audio/audio-hmp-cmds.c +4 -2
@@ -26,6 +26,7 @@#include "audio/audio.h" #include "monitor/hmp.h" #include "monitor/monitor.h" +#include "qapi/error.h" #include "qapi/qmp/qdict.h" static QLIST_HEAD (capture_list_head, CaptureState) capture_head;
@@ -65,10 +66,11 @@ void hmp_wavcapture(Monitor *mon, const QDict *qdict)int nchannels =qdict_get_try_int (qdict,"nchannels" ,2 );const char *audiodev =qdict_get_str (qdict,"audiodev" );CaptureState *s; -AudioState *as =audio_state_by_name (audiodev); +Error *local_err =NULL ; +AudioState *as =audio_state_by_name (audiodev, &local_err);if (!as) { -monitor_printf (mon,"Audiodev '%s' not found\n" , audiodev); +error_report_err (local_err);return ; }
audio/audio.c +2 -1
@@ -2260,7 +2260,7 @@ int audio_buffer_bytes(AudiodevPerDirectionOptions *pdo,audioformat_bytes_per_sample (as->fmt); } -AudioState *audio_state_by_name (const char *name) +AudioState *audio_state_by_name (const char *name,Error **errp) {AudioState *s; QTAILQ_FOREACH(s, &audio_states, list) {
@@ -2269,6 +2269,7 @@ AudioState *audio_state_by_name(const char *name)return s; } } +error_setg (errp,"audiodev '%s' not found" , name);return NULL ; }
audio/audio.h +1 -1
@@ -174,7 +174,7 @@ bool audio_init_audiodevs(void);void audio_help (void );void audio_legacy_help (void ); -AudioState *audio_state_by_name (const char *name); +AudioState *audio_state_by_name (const char *name,Error **errp);const char *audio_get_id (QEMUSoundCard *card);#define DEFINE_AUDIO_PROPERTIES (_s, _f) \
hw/core/qdev-properties-system.c +4 -12
@@ -480,24 +480,16 @@ static void set_audiodev(Object *obj, Visitor *v, const char* name,Property *prop = opaque;QEMUSoundCard *card =object_field_prop_ptr (obj, prop);AudioState *state; -int err =0 ; -char *str; + g_autofree char *str = NULL;if (!visit_type_str (v, name, &str, errp)) {return ; } - state =audio_state_by_name (str); - -if (!state) { - err = -ENOENT ; - goto out; + state =audio_state_by_name (str, errp); +if (state) { + card->state = state; } - card->state = state; - -out: -error_set_from_qdev_prop_error (errp, err, obj, name, str); -g_free (str); }const PropertyInfo qdev_prop_audiodev = {
ui/dbus.c +1 -2
@@ -220,9 +220,8 @@ dbus_display_complete(UserCreatable *uc, Error **errp) }if (dd->audiodev && *dd->audiodev) { -AudioState *audio_state =audio_state_by_name (dd->audiodev); +AudioState *audio_state =audio_state_by_name (dd->audiodev, errp);if (!audio_state) { -error_setg (errp,"Audiodev '%s' not found" , dd->audiodev);return ; }if (!g_str_equal (audio_state->drv->name,"dbus" )) {
ui/vnc.c +1 -2
@@ -4181,9 +4181,8 @@ void vnc_display_open(const char *id, Error **errp) audiodev =qemu_opt_get (opts,"audiodev" );if (audiodev) { - vd->audio_state =audio_state_by_name (audiodev); + vd->audio_state =audio_state_by_name (audiodev, errp);if (!vd->audio_state) { -error_setg (errp,"Audiodev '%s' not found" , audiodev); goto fail; } }
Signature · 1 line
2.41.0
[PULL 13/24] audio: Require AudioState in AUD_add_capture
In reply to Paolo BonziniFrom: Martin Kletzander <[email protected]>
Since all callers require a valid audiodev this function can now safely abort in case of missing AudioState.
Message-ID: <c6e87e678e914df0f59da2145c2753cdb4a16f63.1650874791.git.mkletzan@redhat.com>
--- audio/audio.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
audio/audio.c +2 -4
@@ -1876,10 +1876,8 @@ CaptureVoiceOut *AUD_add_capture(struct capture_callback *cb;if (!s) { -if (!legacy_config) { -dolog ("Capturing without setting an audiodev is deprecated\n" ); - } - s =audio_init (NULL ,NULL ); +error_report ("Capturing without setting an audiodev is not supported" ); +abort (); }if (!audio_get_pdo_out (s->dev)->mixing_engine) {
Signature · 1 line
2.41.0
[PULL 07/24] Makefile: build plugins before running TCG tests
In reply to Paolo BonziniAdd back test-plugins and, after making sure it is always defined, do so unconditionally.
--- tests/Makefile.include | 2 +- tests/meson.build | 5 +---- tests/plugin/meson.build | 18 ++++++++++++------ 3 files changed, 14 insertions(+), 11 deletions(-)
tests/Makefile.include +1 -1
@@ -73,7 +73,7 @@ $(TCG_TESTS_TARGETS:%=distclean-tcg-tests-%): distclean-tcg-tests-%: build-tcg: $(BUILD_TCG_TARGET_RULES) .PHONY: check-tcg -.ninja-goals.check-tcg = all +.ninja-goals.check-tcg = all test-plugins check-tcg: $(RUN_TCG_TARGET_RULES) .PHONY: clean-tcg
tests/meson.build +1 -4
@@ -80,10 +80,7 @@ if 'CONFIG_TCG' in config_all subdir('fp') endif -if get_option('plugins') - subdir('plugin') -endif - +subdir('plugin') subdir('unit') subdir('qapi-schema') subdir('qtest')
tests/plugin/meson.build +12 -6
@@ -1,7 +1,13 @@ t = [] -foreach i : ['bb', 'empty', 'insn', 'mem', 'syscall'] - t += shared_module(i, files(i + '.c'), - include_directories: '../../include/qemu', - dependencies: glib) -endforeach -alias_target('test-plugins', t) +if get_option('plugins') + foreach i : ['bb', 'empty', 'insn', 'mem', 'syscall'] + t += shared_module(i, files(i + '.c'), + include_directories: '../../include/qemu', + dependencies: glib) + endforeach +endif +if t.length() > 0 + alias_target('test-plugins', t) +else + run_target('test-plugins', command: find_program('true')) +endif
Signature · 1 line
2.41.0
[PULL 20/24] hw/arm: Support machine-default audiodev with fallback
In reply to Paolo BonziniFrom: Martin Kletzander <[email protected]>
--- hw/arm/integratorcp.c | 11 ++++++++++- hw/arm/musicpal.c | 11 +++++++++-- hw/arm/nseries.c | 4 ++++ hw/arm/omap2.c | 5 +++++ hw/arm/palm.c | 2 ++ hw/arm/realview.c | 12 ++++++++++++ hw/arm/spitz.c | 17 ++++++++++++----- hw/arm/versatilepb.c | 8 ++++++++ hw/arm/vexpress.c | 5 +++++ hw/arm/xlnx-zcu102.c | 6 ++++++ hw/arm/z2.c | 15 ++++++++++++++- hw/input/tsc210x.c | 5 +++++ 12 files changed, 92 insertions(+), 9 deletions(-)
hw/arm/integratorcp.c +10 -1
@@ -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)
hw/arm/musicpal.c +9 -2
@@ -37,9 +37,9 @@#include "qemu/cutils.h" #include "qom/object.h" #include "hw/net/mv88w8618_eth.h" +#include "audio/audio.h" #include "qemu/error-report.h" -#define MP_MISC_BASE 0x80002000#define MP_MISC_SIZE 0x00001000
@@ -1326,7 +1326,12 @@ static void musicpal_init(MachineState *machine)qdev_connect_gpio_out (key_dev, i,qdev_get_gpio_in (dev, i +15 )); } - wm8750_dev =i2c_slave_create_simple (i2c,TYPE_WM8750 ,MP_WM_ADDR ); + wm8750_dev =i2c_slave_new (TYPE_WM8750 ,MP_WM_ADDR ); +if (machine->audiodev) { +qdev_prop_set_string (DEVICE (wm8750_dev),"audiodev" , machine->audiodev); + } +i2c_slave_realize_and_unref (wm8750_dev, i2c, &error_abort); + dev =qdev_new (TYPE_MV88W8618_AUDIO ); s =SYS_BUS_DEVICE (dev); object_property_set_link(OBJECT(dev), "wm8750", OBJECT(wm8750_dev),
@@ -1347,6 +1352,8 @@ static void musicpal_machine_init(MachineClass *mc) mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm926" ); mc->default_ram_size =MP_RAM_DEFAULT_SIZE ; mc->default_ram_id ="musicpal.ram" ; + +machine_add_audiodev_property (mc); }DEFINE_MACHINE ("musicpal" , musicpal_machine_init)
hw/arm/nseries.c +4 -0
@@ -1432,6 +1432,8 @@ static void n800_class_init(ObjectClass *oc, void *data)/* Actually two chips of 0x4000000 bytes each */ mc->default_ram_size =0x08000000 ; mc->default_ram_id ="omap2.dram" ; + +machine_add_audiodev_property (mc); }static const TypeInfo n800_type = {
@@ -1452,6 +1454,8 @@ static void n810_class_init(ObjectClass *oc, void *data)/* Actually two chips of 0x4000000 bytes each */ mc->default_ram_size =0x08000000 ; mc->default_ram_id ="omap2.dram" ; + +machine_add_audiodev_property (mc); }static const TypeInfo n810_type = {
hw/arm/omap2.c +5 -0
@@ -37,6 +37,7 @@#include "hw/block/flash.h" #include "hw/arm/soc_dma.h" #include "hw/sysbus.h" +#include "hw/boards.h" #include "audio/audio.h" /* Enhanced Audio Controller (CODEC only) */
@@ -609,6 +610,10 @@ static struct omap_eac_s *omap_eac_init(struct omap_target_agent_s *ta, s->codec.txdrq = *drq;omap_eac_reset (s); +if (current_machine->audiodev) { + s->codec.card.name =g_strdup (current_machine->audiodev); + s->codec.card.state =audio_state_by_name (s->codec.card.name, &error_fatal); + }AUD_register_card ("OMAP EAC" , &s->codec.card); memory_region_init_io(&s->iomem, NULL, &omap_eac_ops, s, "omap.eac",
hw/arm/palm.c +2 -0
@@ -310,6 +310,8 @@ static void palmte_machine_init(MachineClass *mc) mc->default_cpu_type =ARM_CPU_TYPE_NAME ("ti925t" ); mc->default_ram_size =0x02000000 ; mc->default_ram_id ="omap1.dram" ; + +machine_add_audiodev_property (mc); }DEFINE_MACHINE ("cheetah" , palmte_machine_init)
hw/arm/realview.c +12 -0
@@ -29,6 +29,7 @@#include "hw/irq.h" #include "hw/i2c/arm_sbcon_i2c.h" #include "hw/sd/sd.h" +#include "audio/audio.h" #define SMP_BOOT_ADDR 0xe0000000#define SMP_BOOTREG_ADDR 0x10000030
@@ -207,6 +208,9 @@ static void realview_init(MachineState *machine, pl041 =qdev_new ("pl041" );qdev_prop_set_uint32 (pl041,"nc_fifo_depth" ,512 ); +if (machine->audiodev) { +qdev_prop_set_string (pl041,"audiodev" , machine->audiodev); + }sysbus_realize_and_unref (SYS_BUS_DEVICE (pl041), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (pl041),0 ,0x10004000 );sysbus_connect_irq (SYS_BUS_DEVICE (pl041),0 , pic[19 ]);
@@ -412,6 +416,8 @@ static void realview_eb_class_init(ObjectClass *oc, void *data) mc->block_default_type =IF_SCSI ; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm926" ); + +machine_add_audiodev_property (mc); }static const TypeInfo realview_eb_type = {
@@ -430,6 +436,8 @@ static void realview_eb_mpcore_class_init(ObjectClass *oc, void *data) mc->max_cpus =4 ; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm11mpcore" ); + +machine_add_audiodev_property (mc); }static const TypeInfo realview_eb_mpcore_type = {
@@ -446,6 +454,8 @@ static void realview_pb_a8_class_init(ObjectClass *oc, void *data) mc->init = realview_pb_a8_init; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-a8" ); + +machine_add_audiodev_property (mc); }static const TypeInfo realview_pb_a8_type = {
@@ -463,6 +473,8 @@ static void realview_pbx_a9_class_init(ObjectClass *oc, void *data) mc->max_cpus =4 ; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-a9" ); + +machine_add_audiodev_property (mc); }static const TypeInfo realview_pbx_a9_type = {
hw/arm/spitz.c +12 -5
@@ -35,6 +35,7 @@#include "exec/address-spaces.h" #include "cpu.h" #include "qom/object.h" +#include "audio/audio.h" enum spitz_model_e { spitz, akita, borzoi, terrier };
@@ -774,15 +775,19 @@ static void spitz_wm8750_addr(void *opaque, int line, int level)i2c_slave_set_address (wm,SPITZ_WM_ADDRL ); } -static void spitz_i2c_setup (PXA2xxState *cpu) +static void spitz_i2c_setup (MachineState *machine,PXA2xxState *cpu) {/* Attach the CPU on one end of our I2C bus. */ I2CBus *bus =pxa2xx_i2c_bus (cpu->i2c[0 ]); -DeviceState *wm; -/* Attach a WM8750 to the bus */ - wm =DEVICE (i2c_slave_create_simple (bus,TYPE_WM8750 ,0 )); +I2CSlave *i2c_dev =i2c_slave_new (TYPE_WM8750 ,0 ); +DeviceState *wm =DEVICE (i2c_dev); + +if (machine->audiodev) { +qdev_prop_set_string (wm,"audiodev" , machine->audiodev); + } +i2c_slave_realize_and_unref (i2c_dev, bus, &error_abort);spitz_wm8750_addr (wm,0 ,0 ); qdev_connect_gpio_out(cpu->gpio, SPITZ_GPIO_WM,
@@ -1013,7 +1018,7 @@ static void spitz_common_init(MachineState *machine)spitz_gpio_setup (mpu, (model == akita) ?1 :2 ); -spitz_i2c_setup (mpu); +spitz_i2c_setup (machine, mpu);if (model == akita)spitz_akita_i2c_setup (mpu);
@@ -1037,6 +1042,8 @@ static void spitz_common_class_init(ObjectClass *oc, void *data) mc->block_default_type =IF_IDE ; mc->ignore_memory_transaction_failures = true; mc->init = spitz_common_init; + +machine_add_audiodev_property (mc); }static const TypeInfo spitz_common_info = {
hw/arm/versatilepb.c +8 -0
@@ -26,6 +26,7 @@#include "hw/char/pl011.h" #include "hw/sd/sd.h" #include "qom/object.h" +#include "audio/audio.h" #define VERSATILE_FLASH_ADDR 0x34000000#define VERSATILE_FLASH_SIZE (64 * 1024 * 1024)
@@ -343,6 +344,9 @@ static void versatile_init(MachineState *machine, int board_id)/* Add PL041 AACI Interface to the LM4549 codec */ pl041 =qdev_new ("pl041" );qdev_prop_set_uint32 (pl041,"nc_fifo_depth" ,512 ); +if (machine->audiodev) { +qdev_prop_set_string (pl041,"audiodev" , machine->audiodev); + }sysbus_realize_and_unref (SYS_BUS_DEVICE (pl041), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (pl041),0 ,0x10004000 );sysbus_connect_irq (SYS_BUS_DEVICE (pl041),0 , sic[24 ]);
@@ -416,6 +420,8 @@ static void versatilepb_class_init(ObjectClass *oc, void *data) mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm926" ); mc->default_ram_id ="versatile.ram" ; + +machine_add_audiodev_property (mc); }static const TypeInfo versatilepb_type = {
@@ -434,6 +440,8 @@ static void versatileab_class_init(ObjectClass *oc, void *data) mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm926" ); mc->default_ram_id ="versatile.ram" ; + +machine_add_audiodev_property (mc); }static const TypeInfo versatileab_type = {
hw/arm/vexpress.c +5 -0
@@ -44,6 +44,7 @@#include "hw/i2c/arm_sbcon_i2c.h" #include "hw/sd/sd.h" #include "qom/object.h" +#include "audio/audio.h" #define VEXPRESS_BOARD_ID 0x8e0#define VEXPRESS_FLASH_SIZE (64 * 1024 * 1024)
@@ -613,6 +614,9 @@ static void vexpress_common_init(MachineState *machine) pl041 =qdev_new ("pl041" );qdev_prop_set_uint32 (pl041,"nc_fifo_depth" ,512 ); +if (machine->audiodev) { +qdev_prop_set_string (pl041,"audiodev" , machine->audiodev); + }sysbus_realize_and_unref (SYS_BUS_DEVICE (pl041), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (pl041),0 , map[VE_PL041 ]);sysbus_connect_irq (SYS_BUS_DEVICE (pl041),0 , pic[11 ]);
@@ -776,6 +780,7 @@ static void vexpress_class_init(ObjectClass *oc, void *data) mc->ignore_memory_transaction_failures = true; mc->default_ram_id ="vexpress.highmem" ; +machine_add_audiodev_property (mc);object_class_property_add_bool (oc,"secure" , vexpress_get_secure, vexpress_set_secure); object_class_property_set_description(oc, "secure",
hw/arm/xlnx-zcu102.c +6 -0
@@ -24,6 +24,7 @@#include "sysemu/device_tree.h" #include "qom/object.h" #include "net/can_emu.h" +#include "audio/audio.h" struct XlnxZCU102 {MachineState parent_obj;
@@ -143,6 +144,10 @@ static void xlnx_zcu102_init(MachineState *machine)object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_XLNX_ZYNQMP ); +if (machine->audiodev) { +qdev_prop_set_string (DEVICE (&s->soc.dp),"audiodev" , machine->audiodev); + } +object_property_set_link (OBJECT (&s->soc),"ddr-ram" ,OBJECT (machine->ram), &error_abort); object_property_set_bool(OBJECT(&s->soc), "secure", s->secure,
@@ -275,6 +280,7 @@ static void xlnx_zcu102_machine_class_init(ObjectClass *oc, void *data) mc->default_cpus =XLNX_ZYNQMP_NUM_APU_CPUS ; mc->default_ram_id ="ddr-ram" ; +machine_add_audiodev_property (mc);object_class_property_add_bool (oc,"secure" , zcu102_get_secure, zcu102_set_secure); object_class_property_set_description(oc, "secure",
hw/arm/z2.c +14 -1
@@ -27,6 +27,7 @@#include "exec/address-spaces.h" #include "cpu.h" #include "qom/object.h" +#include "qapi/error.h" #ifdef DEBUG_Z2 #define DPRINTF (fmt, ...) \
@@ -307,6 +308,7 @@ static void z2_init(MachineState *machine)void *z2_lcd;I2CBus *bus;DeviceState *wm; +I2CSlave *i2c_dev;/* Setup CPU & memory */ mpu =pxa270_init (z2_binfo.ram_size, machine->cpu_type);
@@ -328,8 +330,17 @@ static void z2_init(MachineState *machine)type_register_static (&aer915_info); z2_lcd =ssi_create_peripheral (mpu->ssp[1 ],TYPE_ZIPIT_LCD ); bus =pxa2xx_i2c_bus (mpu->i2c[0 ]); +i2c_slave_create_simple (bus,TYPE_AER915 ,0x55 ); - wm =DEVICE (i2c_slave_create_simple (bus,TYPE_WM8750 ,0x1b )); + + i2c_dev =i2c_slave_new (TYPE_WM8750 ,0x1b ); + wm =DEVICE (i2c_dev); + +if (machine->audiodev) { +qdev_prop_set_string (wm,"audiodev" , machine->audiodev); + } +i2c_slave_realize_and_unref (i2c_dev, bus, &error_abort); + mpu->i2s->opaque = wm; mpu->i2s->codec_out = wm8750_dac_dat; mpu->i2s->codec_in = wm8750_adc_dat;
@@ -348,6 +359,8 @@ static void z2_machine_init(MachineClass *mc) mc->init = z2_init; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("pxa270-c5" ); + +machine_add_audiodev_property (mc); }DEFINE_MACHINE ("z2" , z2_machine_init)
hw/input/tsc210x.c +5 -0
@@ -27,6 +27,7 @@#include "sysemu/reset.h" #include "ui/console.h" #include "hw/arm/omap.h" /* For I2SCodec */ +#include "hw/boards.h" /* for current_machine */ #include "hw/input/tsc2xxx.h" #include "hw/irq.h" #include "migration/vmstate.h"
@@ -1097,6 +1098,10 @@ static void tsc210x_init(TSC210xState *s,qemu_add_mouse_event_handler (tsc210x_touchscreen_event, s,1 , name); +if (current_machine->audiodev) { + s->card.name =g_strdup (current_machine->audiodev); + s->card.state =audio_state_by_name (s->card.name, &error_fatal); + }AUD_register_card (s->name, &s->card);qemu_register_reset ((void *) tsc210x_reset, s);
Signature · 1 line
2.41.0
[PULL 05/24] make-release: do not ship dtc sources
In reply to Paolo BonziniA new enough libfdt is included in all of Debian 11, Ubuntu 20.04 and MSYS2. It has also been included for several minor releases in Fedora and openSUSE Leap, as well as in CentOS. Therefore there is no need anymore to ship the sources together with the QEMU tarballs.
Keep the wrap file so that it can be used with --enable-download, but do not ship the sources anymore with either archive-source.sh or make-release.
--- meson.build | 3 +++ scripts/archive-source.sh | 2 +- scripts/make-release | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-)
meson.build +3 -0
@@ -3070,6 +3070,9 @@ if fdt_required.length() > 0 or fdt_opt == 'enabled' endif if fdt_opt in ['enabled', 'auto', 'system'] + if get_option('wrap_mode') == 'nodownload' + fdt_opt = 'system' + endif fdt = cc.find_library('fdt', required: fdt_opt == 'system') if fdt.found() and cc.links(''' #include <libfdt.h>
scripts/archive-source.sh +1 -1
@@ -26,7 +26,7 @@ sub_file="${sub_tdir}/submodule.tar" # independent of what the developer currently has initialized # in their checkout, because the build environment is completely # different to the host OS. -subprojects="dtc keycodemapdb libvfio-user berkeley-softfloat-3 berkeley-testfloat-3" +subprojects="keycodemapdb libvfio-user berkeley-softfloat-3 berkeley-testfloat-3" sub_deinit="" function cleanup() {
scripts/make-release +1 -1
@@ -17,7 +17,7 @@ if [ $# -ne 2 ]; then fi # Only include wraps that are invoked with subproject() -SUBPROJECTS="dtc libvfio-user keycodemapdb berkeley-softfloat-3 berkeley-testfloat-3" +SUBPROJECTS="libvfio-user keycodemapdb berkeley-softfloat-3 berkeley-testfloat-3" src="$1" version="$2"
Signature · 1 line
2.41.0
[PULL 04/24] pc: remove short_root_bus property
In reply to Paolo BonziniThe property was only used on QEMU 1.6 machine types.
--- hw/pci-host/i440fx.c | 8 -------- hw/pci-host/q35.c | 7 ------- include/hw/pci-host/q35.h | 1 - 3 files changed, 16 deletions(-)
hw/pci-host/i440fx.c +0 -8
@@ -56,7 +56,6 @@ struct I440FXState {uint64_t above_4g_mem_size;uint64_t pci_hole64_size;bool pci_hole64_fix; -uint32_t short_root_bus;char *pci_type; };
@@ -351,19 +350,12 @@ static const TypeInfo i440fx_info = {static const char *i440fx_pcihost_root_bus_path (PCIHostState *host_bridge,PCIBus *rootbus) { -I440FXState *s =I440FX_PCI_HOST_BRIDGE (host_bridge); - -/* For backwards compat with old device paths */ -if (s->short_root_bus) { -return "0000" ; - }return "0000:00" ; }static Property i440fx_props[] = {DEFINE_PROP_SIZE (PCI_HOST_PROP_PCI_HOLE64_SIZE , I440FXState, pci_hole64_size,I440FX_PCI_HOST_HOLE64_SIZE_DEFAULT ), -DEFINE_PROP_UINT32 ("short_root_bus" , I440FXState, short_root_bus,0 ),DEFINE_PROP_SIZE (PCI_HOST_BELOW_4G_MEM_SIZE , I440FXState, below_4g_mem_size,0 ), DEFINE_PROP_SIZE(PCI_HOST_ABOVE_4G_MEM_SIZE, I440FXState,
hw/pci-host/q35.c +0 -7
@@ -73,12 +73,6 @@ static void q35_host_realize(DeviceState *dev, Error **errp)static const char *q35_host_root_bus_path (PCIHostState *host_bridge,PCIBus *rootbus) { -Q35PCIHost *s =Q35_HOST_DEVICE (host_bridge); - -/* For backwards compat with old device paths */ -if (s->mch.short_root_bus) { -return "0000" ; - }return "0000:00" ; }
@@ -181,7 +175,6 @@ static Property q35_host_props[] = { MCH_HOST_BRIDGE_PCIEXBAR_DEFAULT),DEFINE_PROP_SIZE (PCI_HOST_PROP_PCI_HOLE64_SIZE , Q35PCIHost, mch.pci_hole64_size,Q35_PCI_HOST_HOLE64_SIZE_DEFAULT ), -DEFINE_PROP_UINT32 ("short_root_bus" , Q35PCIHost, mch.short_root_bus,0 ),DEFINE_PROP_SIZE (PCI_HOST_BELOW_4G_MEM_SIZE , Q35PCIHost, mch.below_4g_mem_size,0 ), DEFINE_PROP_SIZE(PCI_HOST_ABOVE_4G_MEM_SIZE, Q35PCIHost,
include/hw/pci-host/q35.h +0 -1
@@ -54,7 +54,6 @@ struct MCHPCIState {uint64_t below_4g_mem_size;uint64_t above_4g_mem_size;uint64_t pci_hole64_size; -uint32_t short_root_bus;uint16_t ext_tseg_mbytes; };
Signature · 1 line
2.41.0
[PULL 21/24] hw/ppc: Support machine-default audiodev with fallback
In reply to Paolo BonziniFrom: Martin Kletzander <[email protected]>
--- hw/ppc/prep.c | 7 +++++++ 1 file changed, 7 insertions(+)
hw/ppc/prep.c +7 -0
@@ -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)
Signature · 1 line
2.41.0
[PULL 19/24] Introduce machine property "audiodev"
In reply to Paolo BonziniFrom: Martin Kletzander <[email protected]>
Many machine types have default audio devices with no way to set the underlying audiodev. Instead of adding an option for each and every one of them, this new property can be used as a default during machine initialisation when creating such devices.
--- hw/core/machine.c | 33 +++++++++++++++++++++++++++++++++ include/hw/boards.h | 9 +++++++++ 2 files changed, 42 insertions(+)
hw/core/machine.c +33 -0
@@ -39,6 +39,7 @@#include "hw/virtio/virtio.h" #include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-net.h" +#include "audio/audio.h" GlobalProperty hw_compat_8_1[] = {};const size_t hw_compat_8_1_len =G_N_ELEMENTS (hw_compat_8_1);
@@ -686,6 +687,26 @@ bool device_type_is_dynamic_sysbus(MachineClass *mc, const char *type)return allowed; } +static char *machine_get_audiodev (Object *obj,Error **errp) +{ +MachineState *ms =MACHINE (obj); + +return g_strdup (ms->audiodev); +} + +static void machine_set_audiodev (Object *obj,const char *value, +Error **errp) +{ +MachineState *ms =MACHINE (obj); + +if (!audio_state_by_name (value, errp)) { +return ; + } + +g_free (ms->audiodev); + ms->audiodev =g_strdup (value); +} +HotpluggableCPUList *machine_query_hotpluggable_cpus (MachineState *machine) {int i;
@@ -931,6 +952,17 @@ out_free:qapi_free_BootConfiguration (config); } +void machine_add_audiodev_property (MachineClass *mc) +{ +ObjectClass *oc =OBJECT_CLASS (mc); + +object_class_property_add_str (oc,"audiodev" , + machine_get_audiodev, + machine_set_audiodev); +object_class_property_set_description (oc,"audiodev" , +"Audiodev to use for default machine devices" ); +} +static void machine_class_init (ObjectClass *oc,void *data) {MachineClass *mc =MACHINE_CLASS (oc);
@@ -1136,6 +1168,7 @@ static void machine_finalize(Object *obj)g_free (ms->device_memory);g_free (ms->nvdimms_state);g_free (ms->numa_state); +g_free (ms->audiodev); }bool machine_usb (MachineState *machine)
include/hw/boards.h +9 -0
@@ -24,6 +24,7 @@ OBJECT_DECLARE_TYPE(MachineState, MachineClass, MACHINE)extern MachineState *current_machine; +void machine_add_audiodev_property (MachineClass *mc);void machine_run_board_init (MachineState *machine,const char *mem_path,Error **errp);bool machine_usb (MachineState *machine);int machine_phandle_start (MachineState *machine);
@@ -358,6 +359,14 @@ struct MachineState {MemoryRegion *ram;DeviceMemoryState *device_memory; +/* +* Included in MachineState for simplicity, but not supported +* unless machine_add_audiodev_property is called. Boards +* that have embedded audio devices can call it from the +* machine init function and forward the property to the device. +*/ +char *audiodev; +ram_addr_t ram_size;ram_addr_t maxram_size;uint64_t ram_slots;
Signature · 1 line
2.41.0
[PULL 08/24] esp: use correct type for esp_dma_enable() in sysbus_esp_gpio_demux()
In reply to Paolo BonziniFrom: Mark Cave-Ayland <[email protected]>
The call to esp_dma_enable() was being made with the SYSBUS_ESP type instead of the ESP type. This meant that when GPIO 1 was being used to trigger a DMA request from an external DMA controller, the setting of ESPState's dma_enabled field would clobber unknown memory whilst the dma_cb callback pointer would typically return NULL so the DMA request would never start.
Message-ID: <[email protected]>
--- hw/scsi/esp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/scsi/esp.c +1 -1
@@ -1395,7 +1395,7 @@ static void sysbus_esp_gpio_demux(void *opaque, int irq, int level)parent_esp_reset (s, irq, level);break ;case 1 : -esp_dma_enable (opaque, irq, level); +esp_dma_enable (s, irq, level);break ; } }
Signature · 1 line
2.41.0
[PULL 11/24] crypto: only include tls-cipher-suites in emulators
In reply to Paolo Bonzinitls-cipher-suites is an object that is used to inject TLS configuration into the guest (via fw_cfg). It is never used for host-side TLS operation, and therefore it need not be available in the tools.
--- crypto/meson.build | 3 ++- hw/nvram/meson.build | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-)
crypto/meson.build +2 -1
@@ -46,7 +46,8 @@ endif if have_afalg crypto_ss.add(if_true: files('afalg.c', 'cipher-afalg.c', 'hash-afalg.c')) endif -crypto_ss.add(when: gnutls, if_true: files('tls-cipher-suites.c')) + +system_ss.add(when: gnutls, if_true: files('tls-cipher-suites.c')) util_ss.add(files( 'aes.c',
hw/nvram/meson.build +1 -5
@@ -1,8 +1,4 @@ -if have_system or have_tools - # QOM interfaces must be available anytime QOM is used. - qom_ss.add(files('fw_cfg-interface.c')) -endif - +system_ss.add(files('fw_cfg-interface.c')) system_ss.add(files('fw_cfg.c')) system_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c')) system_ss.add(when: 'CONFIG_DS1225Y', if_true: files('ds1225y.c'))
Signature · 1 line
2.41.0
[PULL 16/24] audio: commonize voice initialization
In reply to Paolo BonziniMove some mostly irrelevant code out of audio_init.
--- audio/audio.c | 19 ++----------------- audio/audio_template.h | 9 ++++++++- 2 files changed, 10 insertions(+), 18 deletions(-)
audio/audio.c +2 -17
@@ -1570,8 +1570,8 @@ static int audio_driver_init(AudioState *s, struct audio_driver *drv, drv->pcm_ops->put_buffer_out = audio_generic_put_buffer_out; } -audio_init_nb_voices_out (s, drv); -audio_init_nb_voices_in (s, drv); +audio_init_nb_voices_out (s, drv,1 ); +audio_init_nb_voices_in (s, drv,0 ); s->drv = drv;return 0 ; }else {
@@ -1774,21 +1774,6 @@ static AudioState *audio_init(Audiodev *dev, const char *name) s->ts =timer_new_ns (QEMU_CLOCK_VIRTUAL , audio_timer, s); - s->nb_hw_voices_out =audio_get_pdo_out (dev)->voices; - s->nb_hw_voices_in =audio_get_pdo_in (dev)->voices; - -if (s->nb_hw_voices_out <1 ) { -dolog ("Bogus number of playback voices %d, setting to 1\n" , - s->nb_hw_voices_out); - s->nb_hw_voices_out =1 ; - } - -if (s->nb_hw_voices_in <0 ) { -dolog ("Bogus number of capture voices %d, setting to 0\n" , - s->nb_hw_voices_in); - s->nb_hw_voices_in =0 ; - } -if (drvname) { driver =audio_driver_lookup (drvname);if (driver) {
audio/audio_template.h +8 -1
@@ -37,11 +37,12 @@#endif static void glue (audio_init_nb_voices_ ,TYPE )(AudioState *s, -struct audio_driver *drv) +struct audio_driver *drv,int min_voices) {int max_voices =glue (drv->max_voices_,TYPE );size_t voice_size =glue (drv->voice_size_,TYPE ); +glue (s->nb_hw_voices_,TYPE ) =glue (audio_get_pdo_,TYPE )(s->dev)->voices;if (glue (s->nb_hw_voices_,TYPE ) > max_voices) {if (!max_voices) {#ifdef DAC
@@ -56,6 +57,12 @@ static void glue(audio_init_nb_voices_, TYPE)(AudioState *s,glue (s->nb_hw_voices_,TYPE ) = max_voices; } +if (glue (s->nb_hw_voices_,TYPE ) < min_voices) { +dolog ("Bogus number of " NAME " voices %d, setting to %d\n" , +glue (s->nb_hw_voices_,TYPE ), + min_voices); + } +if (audio_bug (__func__, !voice_size && max_voices)) {dolog ("drv=`%s' voice_size=0 max_voices=%d\n" , drv->name, max_voices);
Signature · 1 line
2.41.0
[PULL 09/24] esp: restrict non-DMA transfer length to that of available data
In reply to Paolo BonziniFrom: Mark Cave-Ayland <[email protected]>
In the case where a SCSI layer transfer is incorrectly terminated, it is possible for a TI command to cause a SCSI buffer overflow due to the expected transfer data length being less than the available data in the FIFO. When this occurs the unsigned async_len variable underflows and becomes a large offset which writes past the end of the allocated SCSI buffer.
Restrict the non-DMA transfer length to be the smallest of the expected transfer length and the available FIFO data to ensure that it is no longer possible for the SCSI buffer overflow to occur.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1810
Message-ID: <[email protected]>
--- hw/scsi/esp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
hw/scsi/esp.c +2 -1
@@ -759,7 +759,8 @@ static void esp_do_nodma(ESPState *s) }if (to_device) { - len =MIN (fifo8_num_used (&s->fifo),ESP_FIFO_SZ ); + len =MIN (s->async_len,ESP_FIFO_SZ ); + len =MIN (len,fifo8_num_used (&s->fifo));esp_fifo_pop_buf (&s->fifo, s->async_buf, len); s->async_buf += len; s->async_len -= len;
Signature · 1 line
2.41.0
[PULL 12/24] ui/vnc: Require audiodev= to enable audio
In reply to Paolo BonziniIf there is no audiodev do not send the audio ack in response to VNC_ENCODING_AUDIO, so that clients aren't told audio exists, and immediately drop the client if they try to send any audio control messages when audio is not advertised.
--- docs/about/deprecated.rst | 8 +++----- docs/about/removed-features.rst | 6 ++++++ ui/vnc.c | 11 ++++++++++- ui/vnc.h | 2 ++ 4 files changed, 21 insertions(+), 6 deletions(-)
docs/about/deprecated.rst +3 -5
@@ -45,13 +45,11 @@ backend settings instead of environment variables. To ease migration to the new format, the ``-audiodev-help`` option can be used to convert the current values of the environment variables to ``-audiodev`` options. -Creating sound card devices and vnc without ``audiodev=`` property (since 4.2) -'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +Creating sound card devices without ``audiodev=`` property (since 4.2) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' When not using the deprecated legacy audio config, each sound card -should specify an ``audiodev=`` property. Additionally, when using -vnc, you should specify an ``audiodev=`` property if you plan to -transmit audio through the VNC protocol. +should specify an ``audiodev=`` property. Short-form boolean options (since 6.0) ''''''''''''''''''''''''''''''''''''''
docs/about/removed-features.rst +6 -0
@@ -436,6 +436,12 @@ the process listing. This was replaced by the new ``password-secret`` option which lets the password be securely provided on the command line using a ``secret`` object instance. +Creating vnc without ``audiodev=`` property (removed in 8.2) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +When using vnc, you should specify an ``audiodev=`` property if +you plan to transmit audio through the VNC protocol. + QEMU Machine Protocol (QMP) commands ------------------------------------
ui/vnc.c +10 -1
@@ -2195,7 +2195,10 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)send_ext_key_event_ack (vs);break ;case VNC_ENCODING_AUDIO : -send_ext_audio_ack (vs); +if (vs->vd->audio_state) { + vs->features |=VNC_FEATURE_AUDIO_MASK ; +send_ext_audio_ack (vs); + }break ;case VNC_ENCODING_WMVi: vs->features |=VNC_FEATURE_WMVI_MASK ;
@@ -2502,6 +2505,12 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) read_u32(data, 4), read_u32(data, 8));break ;case VNC_MSG_CLIENT_QEMU_AUDIO : +if (!vnc_has_feature (vs,VNC_FEATURE_AUDIO )) { +error_report ("Audio message %d with audio disabled" ,read_u8 (data,2 )); +vnc_client_error (vs); +break ; + } +if (len ==2 )return 4 ;
ui/vnc.h +2 -0
@@ -464,6 +464,7 @@ enum VncFeatures {VNC_FEATURE_LED_STATE ,VNC_FEATURE_XVP ,VNC_FEATURE_CLIPBOARD_EXT , + VNC_FEATURE_AUDIO, };#define VNC_FEATURE_RESIZE_MASK (1 << VNC_FEATURE_RESIZE)
@@ -481,6 +482,7 @@ enum VncFeatures {#define VNC_FEATURE_LED_STATE_MASK (1 << VNC_FEATURE_LED_STATE)#define VNC_FEATURE_XVP_MASK (1 << VNC_FEATURE_XVP)#define VNC_FEATURE_CLIPBOARD_EXT_MASK (1 << VNC_FEATURE_CLIPBOARD_EXT) +#define VNC_FEATURE_AUDIO_MASK (1 << VNC_FEATURE_AUDIO)/* Client -> Server message IDs */
Signature · 1 line
2.41.0
[PULL 23/24] audio: propagate Error * out of audio_init
In reply to Paolo BonziniFrom: Martin Kletzander <[email protected]>
Starting from audio_driver_init, propagate errors via Error ** so that audio_init_audiodevs can simply pass &error_fatal, and AUD_register_card can signal faiure.
--- audio/audio.c | 37 ++++++++++++++++++------------------- audio/audio.h | 4 ++-- hw/arm/omap2.c | 2 +- hw/audio/ac97.c | 6 +++++- hw/audio/adlib.c | 6 ++++-- hw/audio/cs4231a.c | 6 ++++-- hw/audio/es1370.c | 5 ++++- hw/audio/gus.c | 6 ++++-- hw/audio/hda-codec.c | 5 ++++- hw/audio/lm4549.c | 8 +++++--- hw/audio/pcspk.c | 4 +--- hw/audio/sb16.c | 6 ++++-- hw/audio/via-ac97.c | 6 ++++-- hw/audio/wm8750.c | 5 ++++- hw/display/xlnx_dp.c | 6 ++++-- hw/input/tsc210x.c | 2 +- hw/usb/dev-audio.c | 5 ++++- softmmu/vl.c | 4 +--- 18 files changed, 74 insertions(+), 49 deletions(-)
audio/audio.c +18 -19
@@ -1556,7 +1556,7 @@ size_t audio_generic_read(HWVoiceIn *hw, void *buf, size_t size) }static int audio_driver_init (AudioState *s,struct audio_driver *drv, -bool msg,Audiodev *dev) +Audiodev *dev,Error **errp) {Error *local_err =NULL ;
@@ -1577,12 +1577,10 @@ static int audio_driver_init(AudioState *s, struct audio_driver *drv, s->drv = drv;return 0 ; }else { -if (!msg) { -error_free (local_err); - }else if (local_err) { -error_report_err (local_err); +if (local_err) { +error_propagate (errp, local_err); }else { -error_report ("Could not init `%s' audio driver" , drv->name); +error_setg (errp,"Could not init `%s' audio driver" , drv->name); }return -1 ; }
@@ -1733,7 +1731,7 @@ static void audio_create_default_audiodevs(void)* if dev == NULL => legacy implicit initialization, return the already created * state or create a new one */ -static AudioState *audio_init (Audiodev *dev) +static AudioState *audio_init (Audiodev *dev,Error **errp) {static bool atexit_registered;int done =0 ;
@@ -1760,9 +1758,9 @@ static AudioState *audio_init(Audiodev *dev) drvname =AudiodevDriver_str (dev->driver); driver =audio_driver_lookup (drvname);if (driver) { - done = !audio_driver_init (s, driver, true, dev); + done = !audio_driver_init (s, driver, dev, errp); }else { -dolog ("Unknown audio driver `%s'\n" , drvname); +error_setg (errp,"Unknown audio driver `%s'\n" , drvname); }if (!done) { goto out;
@@ -1771,13 +1769,13 @@ static AudioState *audio_init(Audiodev *dev)for (;;) {AudiodevListEntry *e =QSIMPLEQ_FIRST (&default_audiodevs);if (!e) { -dolog ("no default audio driver available\n" ); +error_setg (errp,"no default audio driver available" ); goto out; } s->dev = dev = e->dev; drvname =AudiodevDriver_str (dev->driver); driver =audio_driver_lookup (drvname); -if (!audio_driver_init (s, driver, false, dev)) { +if (!audio_driver_init (s, driver, dev,NULL )) {break ; }QSIMPLEQ_REMOVE_HEAD (&default_audiodevs, next);
@@ -1806,7 +1804,7 @@ out:return NULL ; } -void AUD_register_card (const char *name,QEMUSoundCard *card) +bool AUD_register_card (const char *name,QEMUSoundCard *card,Error **errp) {if (!card->state) {if (!QTAILQ_EMPTY (&audio_states)) {
@@ -1820,13 +1818,18 @@ void AUD_register_card (const char *name, QEMUSoundCard *card)if (QSIMPLEQ_EMPTY (&default_audiodevs)) {audio_create_default_audiodevs (); } - card->state =audio_init (NULL ); + card->state =audio_init (NULL , errp); +if (!card->state) { +return false; + } } } card->name =g_strdup (name);memset (&card->entries,0 ,sizeof (card->entries));QLIST_INSERT_HEAD (&card->state->card_head, card, entries); + +return true; }void AUD_remove_card (QEMUSoundCard *card)
@@ -2153,17 +2156,13 @@ void audio_define(Audiodev *dev)QSIMPLEQ_INSERT_TAIL (&audiodevs, e, next); } -bool audio_init_audiodevs (void ) +void audio_init_audiodevs (void ) {AudiodevListEntry *e; QSIMPLEQ_FOREACH(e, &audiodevs, next) { -if (!audio_init (e->dev)) { -return false; - } +audio_init (e->dev, &error_fatal); } - -return true; }audsettings audiodev_to_audsettings (AudiodevPerDirectionOptions *pdo)
audio/audio.h +2 -2
@@ -94,7 +94,7 @@ typedef struct QEMUAudioTimeStamp { void AUD_vlog (const char *cap, const char *fmt, va_list ap) G_GNUC_PRINTF(2, 0); void AUD_log (const char *cap, const char *fmt, ...) G_GNUC_PRINTF(2, 3); -void AUD_register_card (const char *name,QEMUSoundCard *card); +bool AUD_register_card (const char *name,QEMUSoundCard *card,Error **errp);void AUD_remove_card (QEMUSoundCard *card); CaptureVoiceOut *AUD_add_capture( AudioState *s,
@@ -170,7 +170,7 @@ void audio_sample_from_uint64(void *samples, int pos,void audio_define (Audiodev *audio);void audio_parse_option (const char *opt); -bool audio_init_audiodevs (void ); +void audio_init_audiodevs (void );void audio_help (void );AudioState *audio_state_by_name (const char *name,Error **errp);
hw/arm/omap2.c +1 -1
@@ -614,7 +614,7 @@ static struct omap_eac_s *omap_eac_init(struct omap_target_agent_s *ta, s->codec.card.name =g_strdup (current_machine->audiodev); s->codec.card.state =audio_state_by_name (s->codec.card.name, &error_fatal); } -AUD_register_card ("OMAP EAC" , &s->codec.card); +AUD_register_card ("OMAP EAC" , &s->codec.card, &error_fatal);memory_region_init_io (&s->iomem,NULL , &omap_eac_ops, s,"omap.eac" ,omap_l4_region_size (ta,0 ));
hw/audio/ac97.c +5 -1
@@ -1273,6 +1273,10 @@ static void ac97_realize(PCIDevice *dev, Error **errp)AC97LinkState *s =AC97 (dev);uint8_t *c = s->dev.config; +if (!AUD_register_card ("ac97" , &s->card, errp)) { +return ; + } +/* TODO: no need to override */ c[PCI_COMMAND ] =0x00 ;/* pcicmd pci command rw, ro */ c[PCI_COMMAND +1 ] =0x00 ;
@@ -1306,7 +1310,7 @@ static void ac97_realize(PCIDevice *dev, Error **errp) "ac97-nabm", 256);pci_register_bar (&s->dev,0 ,PCI_BASE_ADDRESS_SPACE_IO , &s->io_nam);pci_register_bar (&s->dev,1 ,PCI_BASE_ADDRESS_SPACE_IO , &s->io_nabm); -AUD_register_card ("ac97" , &s->card); +ac97_on_reset (DEVICE (s)); }
hw/audio/adlib.c +4 -2
@@ -255,6 +255,10 @@ static void adlib_realizefn (DeviceState *dev, Error **errp)AdlibState *s =ADLIB (dev);struct audsettings as; +if (!AUD_register_card ("adlib" , &s->card, errp)) { +return ; + } + s->opl =OPLCreate (3579545 , s->freq);if (!s->opl) {error_setg (errp,"OPLCreate %d failed" , s->freq);
@@ -270,8 +274,6 @@ static void adlib_realizefn (DeviceState *dev, Error **errp) as.fmt =AUDIO_FORMAT_S16 ; as.endianness =AUDIO_HOST_ENDIANNESS ; -AUD_register_card ("adlib" , &s->card); - s->voice = AUD_open_out ( &s->card, s->voice,
hw/audio/cs4231a.c +4 -2
@@ -678,13 +678,15 @@ static void cs4231a_realizefn (DeviceState *dev, Error **errp)return ; } +if (!AUD_register_card ("cs4231a" , &s->card, errp)) { +return ; + } + s->pic =isa_bus_get_irq (bus, s->irq); k =ISADMA_GET_CLASS (s->isa_dma); k->register_channel (s->isa_dma, s->dma, cs_dma_read, s);isa_register_ioport (d, &s->ioports, s->port); - -AUD_register_card ("cs4231a" , &s->card); }static Property cs4231a_properties[] = {
hw/audio/es1370.c +4 -1
@@ -853,6 +853,10 @@ static void es1370_realize(PCIDevice *dev, Error **errp)ES1370State *s =ES1370 (dev);uint8_t *c = s->dev.config; +if (!AUD_register_card ("es1370" , &s->card, errp)) { +return ; + } + c[PCI_STATUS +1 ] =PCI_STATUS_DEVSEL_SLOW >>8 ;#if 0
@@ -868,7 +872,6 @@ static void es1370_realize(PCIDevice *dev, Error **errp)memory_region_init_io (&s->io,OBJECT (s), &es1370_io_ops, s,"es1370" ,256 );pci_register_bar (&s->dev,0 ,PCI_BASE_ADDRESS_SPACE_IO , &s->io); -AUD_register_card ("es1370" , &s->card);es1370_reset (s); }
hw/audio/gus.c +4 -2
@@ -241,14 +241,16 @@ static void gus_realizefn (DeviceState *dev, Error **errp)IsaDmaClass *k;struct audsettings as; +if (!AUD_register_card ("gus" , &s->card, errp)) { +return ; + } + s->isa_dma =isa_bus_get_dma (bus, s->emu.gusdma);if (!s->isa_dma) {error_setg (errp,"ISA controller does not support DMA" );return ; } -AUD_register_card ("gus" , &s->card); - as.freq = s->freq; as.nchannels =2 ; as.fmt =AUDIO_FORMAT_S16 ;
hw/audio/hda-codec.c +4 -1
@@ -685,11 +685,14 @@ static void hda_audio_init(HDACodecDevice *hda,const desc_param *param;uint32_t i, type; +if (!AUD_register_card ("hda" , &a->card, errp)) { +return ; + } + a->desc = desc; a->name =object_get_typename (OBJECT (a));dprint (a,1 ,"%s: cad %d\n" , __func__, a->hda.cad); -AUD_register_card ("hda" , &a->card);for (i =0 ; i < a->desc->nnodes; i++) { node = a->desc->nodes + i; param =hda_codec_find_param (node,AC_PAR_AUDIO_WIDGET_CAP );
hw/audio/lm4549.c +5 -3
@@ -281,6 +281,11 @@ void lm4549_init(lm4549_state *s, lm4549_callback data_req_cb, void* opaque, {struct audsettings as; +/* Register an audio card */ +if (!AUD_register_card ("lm4549" , &s->card, errp)) { +return ; + } +/* Store the callback and opaque pointer */ s->data_req_cb = data_req_cb; s->opaque = opaque;
@@ -288,9 +293,6 @@ void lm4549_init(lm4549_state *s, lm4549_callback data_req_cb, void* opaque,/* Init the registers */ lm4549_reset (s); -/* Register an audio card */ -AUD_register_card ("lm4549" , &s->card); -/* Open a default voice */ as.freq =48000 ; as.nchannels =2 ;
hw/audio/pcspk.c +1 -3
@@ -123,8 +123,6 @@ static int pcspk_audio_init(PCSpkState *s)return 0 ; } -AUD_register_card (s_spk, &s->card); - s->voice =AUD_open_out (&s->card, s->voice, s_spk, s, pcspk_callback, &as);if (!s->voice) {AUD_log (s_spk,"Could not open voice\n" );
@@ -191,7 +189,7 @@ static void pcspk_realizefn(DeviceState *dev, Error **errp)isa_register_ioport (isadev, &s->ioport, s->iobase); -if (s->card.state) { +if (s->card.state &&AUD_register_card (s_spk, &s->card, errp)) {pcspk_audio_init (s); }
hw/audio/sb16.c +4 -2
@@ -1402,6 +1402,10 @@ static void sb16_realizefn (DeviceState *dev, Error **errp)SB16State *s =SB16 (dev);IsaDmaClass *k; +if (!AUD_register_card ("sb16" , &s->card, errp)) { +return ; + } + s->isa_hdma =isa_bus_get_dma (bus, s->hdma); s->isa_dma =isa_bus_get_dma (bus, s->dma);if (!s->isa_dma || !s->isa_hdma) {
@@ -1434,8 +1438,6 @@ static void sb16_realizefn (DeviceState *dev, Error **errp) k->register_channel (s->isa_dma, s->dma, SB_read_DMA, s); s->can_write =1 ; - -AUD_register_card ("sb16" , &s->card); }static Property sb16_properties[] = {
hw/audio/via-ac97.c +4 -2
@@ -426,6 +426,10 @@ static void via_ac97_realize(PCIDevice *pci_dev, Error **errp)ViaAC97State *s =VIA_AC97 (pci_dev);Object *o =OBJECT (s); +if (!AUD_register_card ("via-ac97" , &s->card, errp)) { +return ; + } +/* * Command register Bus Master bit is documented to be fixed at 0 but it's * needed for PCI DMA to work in QEMU. The pegasos2 firmware writes 0 here
@@ -445,8 +449,6 @@ static void via_ac97_realize(PCIDevice *pci_dev, Error **errp)pci_register_bar (pci_dev,1 ,PCI_BASE_ADDRESS_SPACE_IO , &s->fm);memory_region_init_io (&s->midi, o, &midi_ops, s,"via-ac97.midi" ,4 );pci_register_bar (pci_dev,2 ,PCI_BASE_ADDRESS_SPACE_IO , &s->midi); - -AUD_register_card ("via-ac97" , &s->card); }static void via_ac97_exit (PCIDevice *dev)
hw/audio/wm8750.c +4 -1
@@ -624,7 +624,10 @@ static void wm8750_realize(DeviceState *dev, Error **errp) {WM8750State *s =WM8750 (dev); -AUD_register_card (CODEC , &s->card); +if (!AUD_register_card (CODEC , &s->card, errp)) { +return ; + } +wm8750_reset (I2C_SLAVE (s)); }
hw/display/xlnx_dp.c +4 -2
@@ -1302,6 +1302,10 @@ static void xlnx_dp_realize(DeviceState *dev, Error **errp)DisplaySurface *surface;struct audsettings as; +if (!AUD_register_card ("xlnx_dp.audio" , &s->aud_card, errp)) { +return ; + } +aux_bus_realize (s->aux_bus);qdev_realize (DEVICE (s->dpcd),BUS (s->aux_bus), &error_fatal);
@@ -1320,8 +1324,6 @@ static void xlnx_dp_realize(DeviceState *dev, Error **errp) as.fmt =AUDIO_FORMAT_S16 ; as.endianness =0 ; -AUD_register_card ("xlnx_dp.audio" , &s->aud_card); - s->amixer_output_stream = AUD_open_out(&s->aud_card, s->amixer_output_stream, "xlnx_dp.audio.out",
hw/input/tsc210x.c +1 -1
@@ -1102,7 +1102,7 @@ static void tsc210x_init(TSC210xState *s, s->card.name =g_strdup (current_machine->audiodev); s->card.state =audio_state_by_name (s->card.name, &error_fatal); } -AUD_register_card (s->name, &s->card); +AUD_register_card (s->name, &s->card, &error_fatal);qemu_register_reset ((void *) tsc210x_reset, s);vmstate_register (NULL ,0 , vmsd, s);
hw/usb/dev-audio.c +4 -1
@@ -944,12 +944,15 @@ static void usb_audio_realize(USBDevice *dev, Error **errp)USBAudioState *s =USB_AUDIO (dev);int i; +if (!AUD_register_card (TYPE_USB_AUDIO , &s->card, errp)) { +return ; + } + dev->usb_desc = s->multi ? &desc_audio_multi : &desc_audio;usb_desc_create_serial (dev);usb_desc_init (dev); s->dev.opaque = s; -AUD_register_card (TYPE_USB_AUDIO , &s->card); s->out.altset =ALTSET_OFF ; s->out.vol.mute = false;
softmmu/vl.c +1 -3
@@ -1962,9 +1962,7 @@ static void qemu_create_early_backends(void)* setting machine properties, so they can be referred to. */ configure_blockdev (&bdo_queue, machine_class, snapshot); -if (!audio_init_audiodevs ()) { -exit (1 ); - } +audio_init_audiodevs (); }
Signature · 1 line
2.41.0
[PULL 17/24] audio: simplify flow in audio_init
In reply to Paolo BonziniMerge two ifs into one.
--- audio/audio.c | 76 +++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 38 deletions(-)
audio/audio.c +38 -38
@@ -1707,12 +1707,12 @@ static AudiodevListEntry *audiodev_find(* if dev == NULL => legacy implicit initialization, return the already created * state or create a new one */ -static AudioState *audio_init (Audiodev *dev,const char *name) +static AudioState *audio_init (Audiodev *dev) {static bool atexit_registered;size_t i;int done =0 ; -const char *drvname =NULL ; +const char *drvname;VMChangeStateEntry *vmse;AudioState *s;struct audio_driver *driver;
@@ -1736,17 +1736,32 @@ static AudioState *audio_init(Audiodev *dev, const char *name) } } + s =g_new0 (AudioState,1 ); + +QLIST_INIT (&s->hw_head_out); +QLIST_INIT (&s->hw_head_in); +QLIST_INIT (&s->cap_head); +if (!atexit_registered) { +atexit (audio_cleanup); + atexit_registered = true; + } + + s->ts =timer_new_ns (QEMU_CLOCK_VIRTUAL , audio_timer, s); +if (dev) {/* -audiodev option */ - legacy_config = false; + s->dev = dev; drvname =AudiodevDriver_str (dev->driver); - }else if (!QTAILQ_EMPTY (&audio_states)) { -if (!legacy_config) { -dolog ("Device %s: audiodev default parameter is deprecated, please " -"specify audiodev=%s\n" , name, -QTAILQ_FIRST (&audio_states)->dev->id); + driver =audio_driver_lookup (drvname); +if (driver) { + done = !audio_driver_init (s, driver, true, dev); + }else { +dolog ("Unknown audio driver `%s'\n" , drvname); + } +if (!done) { +free_audio_state (s); +return NULL ; } -return QTAILQ_FIRST (&audio_states); }else {/* legacy implicit initialization */ head =audio_handle_legacy_opts ();
@@ -1759,33 +1774,7 @@ static AudioState *audio_init(Audiodev *dev, const char *name)*/ dev =QSIMPLEQ_FIRST (&head)->dev;audio_validate_opts (dev, &error_abort); - } - s =g_new0 (AudioState,1 ); - s->dev = dev; - -QLIST_INIT (&s->hw_head_out); -QLIST_INIT (&s->hw_head_in); -QLIST_INIT (&s->cap_head); -if (!atexit_registered) { -atexit (audio_cleanup); - atexit_registered = true; - } - - s->ts =timer_new_ns (QEMU_CLOCK_VIRTUAL , audio_timer, s); - -if (drvname) { - driver =audio_driver_lookup (drvname); -if (driver) { - done = !audio_driver_init (s, driver, true, dev); - }else { -dolog ("Unknown audio driver `%s'\n" , drvname); - } -if (!done) { -free_audio_state (s); -return NULL ; - } - }else {for (i =0 ; audio_prio_list[i]; i++) {AudiodevListEntry *e =audiodev_find (&head, audio_prio_list[i]); driver =audio_driver_lookup (audio_prio_list[i]);
@@ -1800,8 +1789,9 @@ static AudioState *audio_init(Audiodev *dev, const char *name) } } } + +audio_free_audiodev_list (&head); } -audio_free_audiodev_list (&head);if (!done) { driver =audio_driver_lookup ("none" );
@@ -1841,7 +1831,16 @@ void audio_free_audiodev_list(AudiodevListHead *head)void AUD_register_card (const char *name,QEMUSoundCard *card) {if (!card->state) { - card->state =audio_init (NULL , name); +if (!QTAILQ_EMPTY (&audio_states)) { +if (!legacy_config) { +dolog ("Device %s: audiodev default parameter is deprecated, please " +"specify audiodev=%s\n" , name, +QTAILQ_FIRST (&audio_states)->dev->id); + } + card->state =QTAILQ_FIRST (&audio_states); + }else { + card->state =audio_init (NULL ); + } } card->name =g_strdup (name);
@@ -2171,6 +2170,7 @@ void audio_define(Audiodev *dev) e =g_new0 (AudiodevListEntry,1 ); e->dev = dev;QSIMPLEQ_INSERT_TAIL (&audiodevs, e, next); + legacy_config = false; }bool audio_init_audiodevs (void )
@@ -2178,7 +2178,7 @@ bool audio_init_audiodevs(void)AudiodevListEntry *e; QSIMPLEQ_FOREACH(e, &audiodevs, next) { -if (!audio_init (e->dev,NULL )) { +if (!audio_init (e->dev)) {return false; } }
Signature · 1 line
2.41.0
[PULL 18/24] audio: remove QEMU_AUDIO_* and -audio-help support
In reply to Paolo BonziniThese have been deprecated for a long time, and the introduction of -audio in 7.1.0 has cemented the new way of specifying an audio backend's parameters. However, there is still a need for simple configuration of the audio backend in the desktop case; therefore, if no audiodev is passed to audio_init(), go through a bunch of simple Audiodev* structures and pick the first that can be initialized successfully.
The only QEMU_AUDIO_* option that is left in, waiting for a better idea, is QEMU_AUDIO_DRV=none which is used by qtest.
Remove all the parsing code, including the concept of "can_be_default" audio drivers: now that audio_prio_list[] is only used in a single place, wav can be excluded directly in that function.
--- audio/alsaaudio.c | 1 - audio/audio.c | 138 ++++---- audio/audio.h | 1 - audio/audio_int.h | 5 - audio/audio_legacy.c | 591 -------------------------------- audio/coreaudio.m | 1 - audio/dbusaudio.c | 1 - audio/dsoundaudio.c | 1 - audio/jackaudio.c | 1 - audio/meson.build | 1 - audio/noaudio.c | 1 - audio/ossaudio.c | 1 - audio/paaudio.c | 1 - audio/pwaudio.c | 1 - audio/sdlaudio.c | 1 - audio/sndioaudio.c | 1 - audio/wavaudio.c | 1 - docs/about/deprecated.rst | 8 - docs/about/removed-features.rst | 6 + qemu-options.hx | 10 - softmmu/vl.c | 4 - 21 files changed, 65 insertions(+), 711 deletions(-) delete mode 100644 audio/audio_legacy.c
audio/alsaaudio.c +0 -1
@@ -960,7 +960,6 @@ static struct audio_driver alsa_audio_driver = { .init = alsa_audio_init, .fini = alsa_audio_fini, .pcm_ops = &alsa_pcm_ops, - .can_be_default = 1, .max_voices_out = INT_MAX, .max_voices_in = INT_MAX, .voice_size_out = sizeof (ALSAVoiceOut),
audio/audio.c +59 -79
221 lines not on this page · raw message
audio/audio.h +0 -1
@@ -172,7 +172,6 @@ void audio_define(Audiodev *audio);void audio_parse_option (const char *opt);bool audio_init_audiodevs (void );void audio_help (void ); -void audio_legacy_help (void );AudioState *audio_state_by_name (const char *name,Error **errp);const char *audio_get_id (QEMUSoundCard *card);
audio/audio_int.h +0 -5
@@ -146,7 +146,6 @@ struct audio_driver {void (*set_dbus_server) (AudioState *s,GDBusObjectManagerServer *manager,bool p2p);#endif struct audio_pcm_ops *pcm_ops; -int can_be_default;int max_voices_out;int max_voices_in;size_t voice_size_out;
@@ -243,7 +242,6 @@ extern const struct mixeng_volume nominal_volume;extern const char *audio_prio_list[];void audio_driver_register (audio_driver *drv); -audio_driver *audio_driver_lookup (const char *name);void audio_pcm_init_info (struct audio_pcm_info *info,struct audsettings *as);void audio_pcm_info_clear_buf (struct audio_pcm_info *info,void *buf,int len);
@@ -297,9 +295,6 @@ typedef struct AudiodevListEntry { } AudiodevListEntry; typedef QSIMPLEQ_HEAD(, AudiodevListEntry) AudiodevListHead; -AudiodevListHead audio_handle_legacy_opts (void ); - -void audio_free_audiodev_list (AudiodevListHead *head);void audio_create_pdos (Audiodev *dev);AudiodevPerDirectionOptions *audio_get_pdo_in (Audiodev *dev);
audio/audio_legacy.c deleted +0 -591
591 lines not on this page · raw message
audio/coreaudio.m +0 -1
@@ -673,7 +673,6 @@ static void coreaudio_audio_fini (void *opaque) .init = coreaudio_audio_init, .fini = coreaudio_audio_fini, .pcm_ops = &coreaudio_pcm_ops, - .can_be_default = 1, .max_voices_out = 1, .max_voices_in = 0, .voice_size_out = sizeof (coreaudioVoiceOut),
audio/dbusaudio.c +0 -1
@@ -676,7 +676,6 @@ static struct audio_driver dbus_audio_driver = { .fini = dbus_audio_fini, .set_dbus_server = dbus_audio_set_server, .pcm_ops = &dbus_pcm_ops, - .can_be_default = 1, .max_voices_out = INT_MAX, .max_voices_in = INT_MAX, .voice_size_out = sizeof(DBusVoiceOut),
audio/dsoundaudio.c +0 -1
@@ -721,7 +721,6 @@ static struct audio_driver dsound_audio_driver = { .init = dsound_audio_init, .fini = dsound_audio_fini, .pcm_ops = &dsound_pcm_ops, - .can_be_default = 1, .max_voices_out = INT_MAX, .max_voices_in = 1, .voice_size_out = sizeof (DSoundVoiceOut),
audio/jackaudio.c +0 -1
@@ -676,7 +676,6 @@ static struct audio_driver jack_driver = { .init = qjack_init, .fini = qjack_fini, .pcm_ops = &jack_pcm_ops, - .can_be_default = 1, .max_voices_out = INT_MAX, .max_voices_in = INT_MAX, .voice_size_out = sizeof(QJackOut),
audio/meson.build +0 -1
@@ -1,7 +1,6 @@ system_ss.add([spice_headers, files('audio.c')]) system_ss.add(files( 'audio-hmp-cmds.c', - 'audio_legacy.c', 'mixeng.c', 'noaudio.c', 'wavaudio.c',
audio/noaudio.c +0 -1
@@ -135,7 +135,6 @@ static struct audio_driver no_audio_driver = { .init = no_audio_init, .fini = no_audio_fini, .pcm_ops = &no_pcm_ops, - .can_be_default = 1, .max_voices_out = INT_MAX, .max_voices_in = INT_MAX, .voice_size_out = sizeof (NoVoiceOut),
audio/ossaudio.c +0 -1
@@ -784,7 +784,6 @@ static struct audio_driver oss_audio_driver = { .init = oss_audio_init, .fini = oss_audio_fini, .pcm_ops = &oss_pcm_ops, - .can_be_default = 1, .max_voices_out = INT_MAX, .max_voices_in = INT_MAX, .voice_size_out = sizeof (OSSVoiceOut),
audio/paaudio.c +0 -1
@@ -931,7 +931,6 @@ static struct audio_driver pa_audio_driver = { .init = qpa_audio_init, .fini = qpa_audio_fini, .pcm_ops = &qpa_pcm_ops, - .can_be_default = 1, .max_voices_out = INT_MAX, .max_voices_in = INT_MAX, .voice_size_out = sizeof (PAVoiceOut),
audio/pwaudio.c +0 -1
@@ -843,7 +843,6 @@ static struct audio_driver pw_audio_driver = { .init = qpw_audio_init, .fini = qpw_audio_fini, .pcm_ops = &qpw_pcm_ops, - .can_be_default = 1, .max_voices_out = INT_MAX, .max_voices_in = INT_MAX, .voice_size_out = sizeof(PWVoiceOut),
audio/sdlaudio.c +0 -1
@@ -494,7 +494,6 @@ static struct audio_driver sdl_audio_driver = { .init = sdl_audio_init, .fini = sdl_audio_fini, .pcm_ops = &sdl_pcm_ops, - .can_be_default = 1, .max_voices_out = INT_MAX, .max_voices_in = INT_MAX, .voice_size_out = sizeof(SDLVoiceOut),
audio/sndioaudio.c +0 -1
@@ -550,7 +550,6 @@ static struct audio_driver sndio_audio_driver = { .init = sndio_audio_init, .fini = sndio_audio_fini, .pcm_ops = &sndio_pcm_ops, - .can_be_default = 1, .max_voices_out = INT_MAX, .max_voices_in = INT_MAX, .voice_size_out = sizeof(SndioVoice),
audio/wavaudio.c +0 -1
@@ -208,7 +208,6 @@ static struct audio_driver wav_audio_driver = { .init = wav_audio_init, .fini = wav_audio_fini, .pcm_ops = &wav_pcm_ops, - .can_be_default = 0, .max_voices_out = 1, .max_voices_in = 0, .voice_size_out = sizeof (WAVVoiceOut),
docs/about/deprecated.rst +0 -8
@@ -37,14 +37,6 @@ coverage. System emulator command line arguments -------------------------------------- -``QEMU_AUDIO_`` environment variables and ``-audio-help`` (since 4.0) -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -The ``-audiodev`` argument is now the preferred way to specify audio -backend settings instead of environment variables. To ease migration to -the new format, the ``-audiodev-help`` option can be used to convert -the current values of the environment variables to ``-audiodev`` options. - Creating sound card devices without ``audiodev=`` property (since 4.2) ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
docs/about/removed-features.rst +6 -0
@@ -436,6 +436,12 @@ the process listing. This was replaced by the new ``password-secret`` option which lets the password be securely provided on the command line using a ``secret`` object instance. +``QEMU_AUDIO_`` environment variables and ``-audio-help`` (removed in 8.2) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +The ``-audiodev`` and ``-audio`` command line options are now the only +way to specify audio backend settings. + Creating vnc without ``audiodev=`` property (removed in 8.2) ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
qemu-options.hx +0 -10
@@ -727,16 +727,6 @@ SRST ERST -HXCOMM Deprecated by -audiodev -DEF("audio-help", 0, QEMU_OPTION_audio_help, - "-audio-help show -audiodev equivalent of the currently specified audio settings\n", - QEMU_ARCH_ALL) -SRST -``-audio-help`` - Will show the -audiodev equivalent of the currently specified - (deprecated) environment variables. -ERST - DEF("audio", HAS_ARG, QEMU_OPTION_audio, "-audio [driver=]driver,model=value[,prop[=value][,...]]\n" " specifies the audio backend and device to use;\n"
softmmu/vl.c +0 -4
@@ -2926,10 +2926,6 @@ void qemu_init(int argc, char **argv) }break ;#endif -case QEMU_OPTION_audio_help: -audio_legacy_help (); -exit (0 ); -break ;case QEMU_OPTION_audiodev:audio_parse_option (optarg);break ;
Signature · 1 line
2.41.0
[PULL 14/24] audio: allow returning an error from the driver init
In reply to Paolo BonziniAn error is already printed by audio_driver_init, but we can make it more precise if the driver can return an Error *.
--- audio/alsaaudio.c | 2 +- audio/audio.c | 13 ++++++++++--- audio/audio_int.h | 2 +- audio/coreaudio.m | 2 +- audio/dbusaudio.c | 2 +- audio/dsoundaudio.c | 2 +- audio/jackaudio.c | 2 +- audio/noaudio.c | 2 +- audio/ossaudio.c | 11 ++++++++--- audio/paaudio.c | 7 +++++-- audio/pwaudio.c | 16 +++++++++------- audio/sdlaudio.c | 5 +++-- audio/sndioaudio.c | 2 +- audio/spiceaudio.c | 5 ++++- audio/wavaudio.c | 2 +- 15 files changed, 48 insertions(+), 27 deletions(-)
audio/alsaaudio.c +1 -1
@@ -904,7 +904,7 @@ static void alsa_init_per_direction(AudiodevAlsaPerDirectionOptions *apdo) } } -static void *alsa_audio_init (Audiodev *dev) +static void *alsa_audio_init (Audiodev *dev,Error **errp) {AudiodevAlsaOptions *aopts;assert (dev->driver ==AUDIODEV_DRIVER_ALSA );
audio/audio.c +10 -3
@@ -33,6 +33,7 @@#include "qapi/qapi-visit-audio.h" #include "qapi/qapi-commands-audio.h" #include "qemu/cutils.h" +#include "qemu/error-report.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/help_option.h"
@@ -1555,7 +1556,9 @@ size_t audio_generic_read(HWVoiceIn *hw, void *buf, size_t size)static int audio_driver_init (AudioState *s,struct audio_driver *drv,bool msg,Audiodev *dev) { - s->drv_opaque = drv->init (dev); +Error *local_err =NULL ; + + s->drv_opaque = drv->init (dev, &local_err);if (s->drv_opaque) {if (!drv->pcm_ops->get_buffer_in) {
@@ -1572,8 +1575,12 @@ static int audio_driver_init(AudioState *s, struct audio_driver *drv, s->drv = drv;return 0 ; }else { -if (msg) { -dolog ("Could not init `%s' audio driver\n" , drv->name); +if (!msg) { +error_free (local_err); + }else if (local_err) { +error_report_err (local_err); + }else { +error_report ("Could not init `%s' audio driver" , drv->name); }return -1 ; }
audio/audio_int.h +1 -1
@@ -140,7 +140,7 @@ typedef struct audio_driver audio_driver;struct audio_driver {const char *name;const char *descr; -void *(*init) (Audiodev *); +void *(*init) (Audiodev *,Error **);void (*fini) (void *);#ifdef CONFIG_GIO void (*set_dbus_server) (AudioState *s,GDBusObjectManagerServer *manager,bool p2p);
audio/coreaudio.m +1 -1
@@ -644,7 +644,7 @@ static void coreaudio_enable_out(HWVoiceOut *hw, bool enable) update_device_playback_state(core); } -static void *coreaudio_audio_init(Audiodev *dev) +static void *coreaudio_audio_init(Audiodev *dev, Error **errp) { return dev; }
audio/dbusaudio.c +1 -1
@@ -395,7 +395,7 @@ dbus_enable_in(HWVoiceIn *hw, bool enable) }static void * -dbus_audio_init (Audiodev *dev) +dbus_audio_init (Audiodev *dev,Error **errp) {DBusAudio *da =g_new0 (DBusAudio,1 );
audio/dsoundaudio.c +1 -1
@@ -619,7 +619,7 @@ static void dsound_audio_fini (void *opaque)g_free (s); } -static void *dsound_audio_init (Audiodev *dev) +static void *dsound_audio_init (Audiodev *dev,Error **errp) {int err;HRESULT hr;
audio/jackaudio.c +1 -1
@@ -645,7 +645,7 @@ static int qjack_thread_creator(jack_native_thread_t *thread, }#endif -static void *qjack_init (Audiodev *dev) +static void *qjack_init (Audiodev *dev,Error **errp) {assert (dev->driver ==AUDIODEV_DRIVER_JACK );return dev;
audio/noaudio.c +1 -1
@@ -104,7 +104,7 @@ static void no_enable_in(HWVoiceIn *hw, bool enable) } } -static void *no_audio_init (Audiodev *dev) +static void *no_audio_init (Audiodev *dev,Error **errp) {return &no_audio_init; }
audio/ossaudio.c +8 -3
@@ -28,6 +28,7 @@#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/host-utils.h" +#include "qapi/error.h" #include "audio.h" #include "trace.h"
@@ -736,7 +737,7 @@ static void oss_init_per_direction(AudiodevOssPerDirectionOptions *opdo) } } -static void *oss_audio_init (Audiodev *dev) +static void *oss_audio_init (Audiodev *dev,Error **errp) {AudiodevOssOptions *oopts;assert (dev->driver ==AUDIODEV_DRIVER_OSS );
@@ -745,8 +746,12 @@ static void *oss_audio_init(Audiodev *dev)oss_init_per_direction (oopts->in);oss_init_per_direction (oopts->out); -if (access (oopts->in->dev ?:"/dev/dsp" ,R_OK |W_OK ) <0 || -access (oopts->out->dev ?:"/dev/dsp" ,R_OK |W_OK ) <0 ) { +if (access (oopts->in->dev ?:"/dev/dsp" ,R_OK |W_OK ) <0 ) { +error_setg_errno (errp, errno,"%s not accessible" , oopts->in->dev ?:"/dev/dsp" ); +return NULL ; + } +if (access (oopts->out->dev ?:"/dev/dsp" ,R_OK |W_OK ) <0 ) { +error_setg_errno (errp, errno,"%s not accessible" , oopts->out->dev ?:"/dev/dsp" );return NULL ; }return dev;
audio/paaudio.c +5 -2
@@ -3,7 +3,7 @@#include "qemu/osdep.h" #include "qemu/module.h" #include "audio.h" -#include "qapi/opts-visitor.h" +#include "qapi/error.h" #include <pulse/pulseaudio.h>
@@ -818,7 +818,7 @@ fail:return NULL ; } -static void *qpa_audio_init (Audiodev *dev) +static void *qpa_audio_init (Audiodev *dev,Error **errp) {paaudio *g;AudiodevPaOptions *popts = &dev->u.pa;
@@ -834,10 +834,12 @@ static void *qpa_audio_init(Audiodev *dev) runtime =getenv ("XDG_RUNTIME_DIR" );if (!runtime) { +error_setg (errp,"XDG_RUNTIME_DIR not set" );return NULL ; }snprintf (pidfile,sizeof (pidfile),"%s/pulse/pid" , runtime);if (stat (pidfile, &st) !=0 ) { +error_setg_errno (errp, errno,"could not stat pidfile %s" , pidfile);return NULL ; } }
@@ -867,6 +869,7 @@ static void *qpa_audio_init(Audiodev *dev) }if (!g->conn) {g_free (g); +error_setg (errp,"could not connect to PulseAudio server" );return NULL ; }
audio/pwaudio.c +9 -7
@@ -13,6 +13,7 @@#include "audio.h" #include <errno.h> #include "qemu/error-report.h" +#include "qapi/error.h" #include <spa/param/audio/format-utils.h> #include <spa/utils/ringbuffer.h> #include <spa/utils/result.h>
@@ -736,7 +737,7 @@ static const struct pw_core_events core_events = { };static void * -qpw_audio_init (Audiodev *dev) +qpw_audio_init (Audiodev *dev,Error **errp) { g_autofree pwaudio *pw = g_new0(pwaudio, 1);
@@ -748,19 +749,19 @@ qpw_audio_init(Audiodev *dev) pw->dev = dev; pw->thread_loop =pw_thread_loop_new ("PipeWire thread loop" ,NULL );if (pw->thread_loop ==NULL ) { -error_report ("Could not create PipeWire loop: %s" ,g_strerror (errno)); +error_setg_errno (errp, errno,"Could not create PipeWire loop" ); goto fail; } pw->context =pw_context_new (pw_thread_loop_get_loop (pw->thread_loop),NULL ,0 );if (pw->context ==NULL ) { -error_report ("Could not create PipeWire context: %s" ,g_strerror (errno)); +error_setg_errno (errp, errno,"Could not create PipeWire context" ); goto fail; }if (pw_thread_loop_start (pw->thread_loop) <0 ) { -error_report ("Could not start PipeWire loop: %s" ,g_strerror (errno)); +error_setg_errno (errp, errno,"Could not start PipeWire loop" ); goto fail; }
@@ -769,13 +770,13 @@ qpw_audio_init(Audiodev *dev) pw->core =pw_context_connect (pw->context,NULL ,0 );if (pw->core ==NULL ) {pw_thread_loop_unlock (pw->thread_loop); - goto fail; + goto fail_error; }if (pw_core_add_listener (pw->core, &pw->core_listener, &core_events, pw) <0 ) {pw_thread_loop_unlock (pw->thread_loop); - goto fail; + goto fail_error; }if (wait_resync (pw) <0 ) {pw_thread_loop_unlock (pw->thread_loop);
@@ -785,8 +786,9 @@ qpw_audio_init(Audiodev *dev)return g_steal_pointer (&pw); +fail_error: +error_setg (errp,"Failed to initialize PW context" ); fail: -AUD_log (AUDIO_CAP ,"Failed to initialize PW context" );if (pw->thread_loop) {pw_thread_loop_stop (pw->thread_loop); }
audio/sdlaudio.c +3 -2
@@ -26,6 +26,7 @@#include <SDL.h> #include <SDL_thread.h> #include "qemu/module.h" +#include "qapi/error.h" #include "audio.h" #ifndef _WIN32
@@ -449,10 +450,10 @@ static void sdl_enable_in(HWVoiceIn *hw, bool enable)SDL_PauseAudioDevice (sdl->devid, !enable); } -static void *sdl_audio_init (Audiodev *dev) +static void *sdl_audio_init (Audiodev *dev,Error **errp) {if (SDL_InitSubSystem (SDL_INIT_AUDIO )) { -sdl_logerr ("SDL failed to initialize audio subsystem\n" ); +error_setg (errp,"SDL failed to initialize audio subsystem" );return NULL ; }
audio/sndioaudio.c +1 -1
@@ -518,7 +518,7 @@ static void sndio_fini_in(HWVoiceIn *hw)sndio_fini (self); } -static void *sndio_audio_init (Audiodev *dev) +static void *sndio_audio_init (Audiodev *dev,Error **errp) {assert (dev->driver ==AUDIODEV_DRIVER_SNDIO );return dev;
audio/spiceaudio.c +4 -1
@@ -22,6 +22,7 @@#include "qemu/module.h" #include "qemu/error-report.h" #include "qemu/timer.h" +#include "qapi/error.h" #include "ui/qemu-spice.h" #define AUDIO_CAP "spice"
@@ -71,11 +72,13 @@ static const SpiceRecordInterface record_sif = { .base.minor_version = SPICE_INTERFACE_RECORD_MINOR, }; -static void *spice_audio_init (Audiodev *dev) +static void *spice_audio_init (Audiodev *dev,Error **errp) {if (!using_spice) { +error_setg (errp,"Cannot use spice audio without -spice" );return NULL ; } +return &spice_audio_init; }
audio/wavaudio.c +1 -1
@@ -182,7 +182,7 @@ static void wav_enable_out(HWVoiceOut *hw, bool enable) } } -static void *wav_audio_init (Audiodev *dev) +static void *wav_audio_init (Audiodev *dev,Error **errp) {assert (dev->driver ==AUDIODEV_DRIVER_WAV );return dev;
Signature · 1 line
2.41.0
[PULL 24/24] audio: forbid default audiodev backend with -nodefaults
In reply to Paolo BonziniNow that all callers support setting an audiodev, forbid using the default audiodev if -nodefaults is provided on the command line.
--- audio/audio.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
audio/audio.c +16 -0
@@ -1692,6 +1692,10 @@ static void audio_create_default_audiodevs(void) {const char *drvname =getenv ("QEMU_AUDIO_DRV" ); +if (!defaults_enabled ()) { +return ; + } +/* QEMU_AUDIO_DRV=none is used by libqtest. */ if (drvname && !g_str_equal (drvname,"none" )) {error_report ("Please use -audiodev instead of QEMU_AUDIO_*" );
@@ -1808,6 +1812,14 @@ bool AUD_register_card (const char *name, QEMUSoundCard *card, Error **errp) {if (!card->state) {if (!QTAILQ_EMPTY (&audio_states)) { +/* +* FIXME: once it is possible to create an arbitrary +* default device via -audio DRIVER,OPT=VALUE (no "model"), +* replace this special case with the default AudioState*, +* storing it in a separate global. For now, keep the +* warning to encourage moving off magic use of the first +* -audiodev. +*/ if (QSIMPLEQ_EMPTY (&default_audiodevs)) { dolog("Device %s: audiodev default parameter is deprecated, please " "specify audiodev=%s\n", name,
@@ -1820,6 +1832,10 @@ bool AUD_register_card (const char *name, QEMUSoundCard *card, Error **errp) } card->state =audio_init (NULL , errp);if (!card->state) { +if (!QSIMPLEQ_EMPTY (&audiodevs)) { +error_append_hint (errp,"Perhaps you wanted to set audiodev=%s?" , +QSIMPLEQ_FIRST (&audiodevs)->dev->id); + }return false; } }
Signature · 1 line
2.41.0
[PULL 22/24] vt82c686 machines: Support machine-default audiodev with fallback
In reply to Paolo Bonzini--- hw/mips/fuloong2e.c | 15 ++++++++++++--- hw/ppc/pegasos2.c | 12 ++++++++++-- 2 files changed, 22 insertions(+), 5 deletions(-)
hw/mips/fuloong2e.c +12 -3
@@ -295,9 +295,17 @@ static void mips_fuloong2e_init(MachineState *machine) pci_bus =bonito_init ((qemu_irq *)&(env->irq[2 ]));/* South bridge -> IP5 */ - pci_dev =pci_create_simple_multifunction (pci_bus, -PCI_DEVFN (FULOONG2E_VIA_SLOT ,0 ), -TYPE_VT82C686B_ISA ); + pci_dev =pci_new_multifunction (PCI_DEVFN (FULOONG2E_VIA_SLOT ,0 ), +TYPE_VT82C686B_ISA ); + +/* Set properties on individual devices before realizing the south bridge */ +if (machine->audiodev) { + dev =DEVICE (object_resolve_path_component (OBJECT (pci_dev),"ac97" )); +qdev_prop_set_string (dev,"audiodev" , machine->audiodev); + } + +pci_realize_and_unref (pci_dev, pci_bus, &error_abort); + object_property_add_alias(OBJECT(machine), "rtc-time", object_resolve_path_component(OBJECT(pci_dev), "rtc"),
@@ -337,6 +345,7 @@ static void mips_fuloong2e_machine_init(MachineClass *mc) mc->default_ram_size =256 * MiB; mc->default_ram_id ="fuloong2e.ram" ; mc->minimum_page_bits =14 ; +machine_add_audiodev_property (mc); }DEFINE_MACHINE ("fuloong2e" , mips_fuloong2e_machine_init)
hw/ppc/pegasos2.c +10 -2
@@ -180,8 +180,15 @@ static void pegasos2_init(MachineState *machine)pci_bus_irqs (pci_bus, pegasos2_pci_irq, pm,PCI_NUM_PINS );/* VIA VT8231 South Bridge (multifunction PCI device) */ - via =OBJECT (pci_create_simple_multifunction (pci_bus,PCI_DEVFN (12 ,0 ), -TYPE_VT8231_ISA )); + via =OBJECT (pci_new_multifunction (PCI_DEVFN (12 ,0 ),TYPE_VT8231_ISA )); + +/* Set properties on individual devices before realizing the south bridge */ +if (machine->audiodev) { + dev =PCI_DEVICE (object_resolve_path_component (via,"ac97" )); +qdev_prop_set_string (DEVICE (dev),"audiodev" , machine->audiodev); + } + +pci_realize_and_unref (PCI_DEVICE (via), pci_bus, &error_abort);for (i =0 ; i <PCI_NUM_PINS ; i++) { pm->via_pirq[i] =qdev_get_gpio_in_named (DEVICE (via),"pirq" , i); }
@@ -556,6 +563,7 @@ static void pegasos2_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("7457_v1.2" ); mc->default_ram_id ="pegasos2.ram" ; mc->default_ram_size =512 * MiB; +machine_add_audiodev_property (mc); vhc->cpu_in_nested = pegasos2_cpu_in_nested; vhc->hypercall = pegasos2_hypercall;
Signature · 1 line
2.41.0
[PULL 02/24] accel/kvm/kvm-all: Handle register access errors
In reply to Paolo BonziniFrom: Akihiko Odaki <[email protected]>
A register access error typically means something seriously wrong happened so that anything bad can happen after that and recovery is impossible.
Even failing one register access is catastorophic as architecture-specific code are not written so that it torelates such failures.
Make sure the VM stop and nothing worse happens if such an error occurs.
Message-ID: <[email protected]>
--- accel/kvm/kvm-all.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-)
accel/kvm/kvm-all.c +28 -4
@@ -2851,7 +2851,13 @@ bool kvm_cpu_check_are_resettable(void)static void do_kvm_cpu_synchronize_state (CPUState *cpu,run_on_cpu_data arg) {if (!cpu->vcpu_dirty) { -kvm_arch_get_registers (cpu); +int ret =kvm_arch_get_registers (cpu); +if (ret) { +error_report ("Failed to get registers: %s" ,strerror (-ret)); +cpu_dump_state (cpu, stderr,CPU_DUMP_CODE ); +vm_stop (RUN_STATE_INTERNAL_ERROR ); + } + cpu->vcpu_dirty = true; } }
@@ -2865,7 +2871,13 @@ void kvm_cpu_synchronize_state(CPUState *cpu)static void do_kvm_cpu_synchronize_post_reset (CPUState *cpu,run_on_cpu_data arg) { -kvm_arch_put_registers (cpu,KVM_PUT_RESET_STATE ); +int ret =kvm_arch_put_registers (cpu,KVM_PUT_RESET_STATE ); +if (ret) { +error_report ("Failed to put registers after reset: %s" ,strerror (-ret)); +cpu_dump_state (cpu, stderr,CPU_DUMP_CODE ); +vm_stop (RUN_STATE_INTERNAL_ERROR ); + } + cpu->vcpu_dirty = false; }
@@ -2876,7 +2888,12 @@ void kvm_cpu_synchronize_post_reset(CPUState *cpu)static void do_kvm_cpu_synchronize_post_init (CPUState *cpu,run_on_cpu_data arg) { -kvm_arch_put_registers (cpu,KVM_PUT_FULL_STATE ); +int ret =kvm_arch_put_registers (cpu,KVM_PUT_FULL_STATE ); +if (ret) { +error_report ("Failed to put registers after init: %s" ,strerror (-ret)); +exit (1 ); + } + cpu->vcpu_dirty = false; }
@@ -2969,7 +2986,14 @@ int kvm_cpu_exec(CPUState *cpu)MemTxAttrs attrs;if (cpu->vcpu_dirty) { -kvm_arch_put_registers (cpu,KVM_PUT_RUNTIME_STATE ); + ret =kvm_arch_put_registers (cpu,KVM_PUT_RUNTIME_STATE ); +if (ret) { +error_report ("Failed to put registers after init: %s" , +strerror (-ret)); + ret =-1 ; +break ; + } + cpu->vcpu_dirty = false; }
Signature · 1 line
2.41.0
[PULL 03/24] e1000: remove old compatibility code
In reply to Paolo BonziniThis code is not needed anymore in the supported machine types.
--- hw/net/e1000.c | 79 +++++++++++++++++--------------------------------- 1 file changed, 27 insertions(+), 52 deletions(-)
hw/net/e1000.c +27 -52
@@ -127,13 +127,9 @@ struct E1000State_st {QEMUTimer *flush_queue_timer;/* Compatibility flags for migration to/from qemu 1.3.0 and older */ -#define E1000_FLAG_AUTONEG_BIT 0 -#define E1000_FLAG_MIT_BIT 1#define E1000_FLAG_MAC_BIT 2#define E1000_FLAG_TSO_BIT 3#define E1000_FLAG_VET_BIT 4 -#define E1000_FLAG_AUTONEG (1 << E1000_FLAG_AUTONEG_BIT) -#define E1000_FLAG_MIT (1 << E1000_FLAG_MIT_BIT)#define E1000_FLAG_MAC (1 << E1000_FLAG_MAC_BIT)#define E1000_FLAG_TSO (1 << E1000_FLAG_TSO_BIT)#define E1000_FLAG_VET (1 << E1000_FLAG_VET_BIT)
@@ -180,7 +176,7 @@ e1000_autoneg_done(E1000State *s)static bool have_autoneg (E1000State *s) { -return chkflag (AUTONEG ) && (s->phy_reg[MII_BMCR ] &MII_BMCR_AUTOEN ); +return (s->phy_reg[MII_BMCR ] &MII_BMCR_AUTOEN ); } static void
@@ -308,35 +304,34 @@ set_interrupt_cause(E1000State *s, int index, uint32_t val)if (s->mit_timer_on) {return ; } -if (chkflag (MIT )) { -/* Compute the next mitigation delay according to pending -* interrupts and the current values of RADV (provided -* RDTR!=0), TADV and ITR. -* Then rearm the timer. -*/ - mit_delay =0 ; -if (s->mit_ide && - (pending_ints & (E1000_ICR_TXQE |E1000_ICR_TXDW ))) { -mit_update_delay (&mit_delay, s->mac_reg[TADV ] *4 ); - } -if (s->mac_reg[RDTR ] && (pending_ints &E1000_ICS_RXT0 )) { -mit_update_delay (&mit_delay, s->mac_reg[RADV ] *4 ); - } -mit_update_delay (&mit_delay, s->mac_reg[ITR ]); -/* -* According to e1000 SPEC, the Ethernet controller guarantees -* a maximum observable interrupt rate of 7813 interrupts/sec. -* Thus if mit_delay < 500 then the delay should be set to the -* minimum delay possible which is 500. -*/ - mit_delay = (mit_delay <500 ) ?500 : mit_delay; - - s->mit_timer_on =1 ; -timer_mod (s->mit_timer,qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + - mit_delay *256 ); - s->mit_ide =0 ; +/* Compute the next mitigation delay according to pending +* interrupts and the current values of RADV (provided +* RDTR!=0), TADV and ITR. +* Then rearm the timer. +*/ + mit_delay =0 ; +if (s->mit_ide && + (pending_ints & (E1000_ICR_TXQE |E1000_ICR_TXDW ))) { +mit_update_delay (&mit_delay, s->mac_reg[TADV ] *4 ); } +if (s->mac_reg[RDTR ] && (pending_ints &E1000_ICS_RXT0 )) { +mit_update_delay (&mit_delay, s->mac_reg[RADV ] *4 ); + } +mit_update_delay (&mit_delay, s->mac_reg[ITR ]); + +/* +* According to e1000 SPEC, the Ethernet controller guarantees +* a maximum observable interrupt rate of 7813 interrupts/sec. +* Thus if mit_delay < 500 then the delay should be set to the +* minimum delay possible which is 500. +*/ + mit_delay = (mit_delay <500 ) ?500 : mit_delay; + + s->mit_timer_on =1 ; +timer_mod (s->mit_timer,qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + + mit_delay *256 ); + s->mit_ide =0 ; } s->mit_irq_level = (pending_ints !=0 );
@@ -1223,9 +1218,6 @@ enum { MAC_ACCESS_PARTIAL = 1, MAC_ACCESS_FLAG_NEEDED = 2 };* n - flag needed * p - partially implenented */ static const uint8_t mac_reg_access[0x8000 ] = { - [RDTR ] =markflag (MIT ), [TADV ] =markflag (MIT ), - [RADV ] =markflag (MIT ), [ITR ] =markflag (MIT ), - [IPAV ] =markflag (MAC ), [WUC ] =markflag (MAC ), [IP6AT ] =markflag (MAC ), [IP4AT ] =markflag (MAC ), [FFVT ] =markflag (MAC ), [WUPM ] =markflag (MAC ),
@@ -1394,11 +1386,6 @@ static int e1000_post_load(void *opaque, int version_id)E1000State *s = opaque;NetClientState *nc =qemu_get_queue (s->nic); -if (!chkflag (MIT )) { - s->mac_reg[ITR ] = s->mac_reg[RDTR ] = s->mac_reg[RADV ] = - s->mac_reg[TADV ] =0 ; - s->mit_irq_level = false; - } s->mit_ide =0 ; s->mit_timer_on = true;timer_mod (s->mit_timer,qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) +1 );
@@ -1432,13 +1419,6 @@ static int e1000_tx_tso_post_load(void *opaque, int version_id)return 0 ; } -static bool e1000_mit_state_needed (void *opaque) -{ -E1000State *s = opaque; - -return chkflag (MIT ); -} -static bool e1000_full_mac_needed (void *opaque) {E1000State *s = opaque;
@@ -1457,7 +1437,6 @@ static const VMStateDescription vmstate_e1000_mit_state = { .name = "e1000/mit_state", .version_id = 1, .minimum_version_id = 1, - .needed = e1000_mit_state_needed, .fields = (VMStateField []) {VMSTATE_UINT32 (mac_reg[RDTR ], E1000State),VMSTATE_UINT32 (mac_reg[RADV ], E1000State),
@@ -1699,10 +1678,6 @@ static void pci_e1000_realize(PCIDevice *pci_dev, Error **errp)static Property e1000_properties[] = {DEFINE_NIC_PROPERTIES (E1000State, conf), -DEFINE_PROP_BIT ("autonegotiation" , E1000State, - compat_flags,E1000_FLAG_AUTONEG_BIT , true), -DEFINE_PROP_BIT ("mitigation" , E1000State, - compat_flags,E1000_FLAG_MIT_BIT , true),DEFINE_PROP_BIT ("extra_mac_registers" , E1000State, compat_flags,E1000_FLAG_MAC_BIT , true), DEFINE_PROP_BIT("migrate_tso_props", E1000State,
Signature · 1 line
2.41.0
Stefan Hajnoczi
AppliedApplied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/8.2 for any user-visible changes.
03.10.2023 11:30, Paolo Bonzini:
Quoted 30 lines
----------------------------------------------------------------
* fix from optionrom build
* fix for KVM on Apple M2
* introduce machine property "audiodev"
* ui/vnc: Require audiodev= to enable audio
* audio: remove QEMU_AUDIO_* and -audio-help support
* audio: forbid using default audiodev backend with -audiodev and -nodefaults
* remove compatibility code for old machine types
* make-release: do not ship dtc sources
* build system cleanups----------------------------------------------------------------
Akihiko Odaki (1):
accel/kvm/kvm-all: Handle register access errorsFabiano Rosas (1):
optionrom: Remove build-id sectionMark Cave-Ayland (3):
esp: use correct type foresp_dma_enable()insysbus_esp_gpio_demux()
esp: restrict non-DMA transfer length to that of available data
scsi-disk: ensure that FORMAT UNIT commands are terminatedMartin Kletzander (5):
audio: Require AudioState inAUD_add_captureIntroduce machine property "audiodev" hw/arm: Support machine-default audiodev with fallback hw/ppc: Support machine-default audiodev with fallback
audio: propagate Error * out ofaudio_init
Quoted 15 lines
Paolo Bonzini (14):
e1000: remove old compatibility code
pc: removeshort_root_busproperty
make-release: do not ship dtc sources
meson: clean upstatic_librarykeyword arguments
Makefile: build plugins before running TCG tests
crypto: only include tls-cipher-suites in emulators ui/vnc: Require audiodev= to enable audio
audio: allow returning an error from the driver init
audio: return Error ** fromaudio_state_by_name
audio: commonize voice initialization
audio: simplify flow inaudio_init
audio: remove QEMU_AUDIO_* and -audio-help support vt82c686 machines: Support machine-default audiodev with fallback
audio: forbid default audiodev backend with -nodefaults
I'm picking the following items:
Fabiano Rosas (1):
optionrom: Remove build-id section
Mark Cave-Ayland (3):
esp: use correct type for esp_dma_enable() in sysbus_esp_gpio_demux()
esp: restrict non-DMA transfer length to that of available data
scsi-disk: ensure that FORMAT UNIT commands are terminated
for -stable (both 7.2 & 8.1).
Thanks,
/mjt