3:18 a.m.
Somehow I missed this one property during initial impl of audio
Daniel P. Berrangé (2):
conf: add support for timer period audio setting
qemu: wire up support for timer period audio setting
docs/formatdomain.rst | 6 +++++-
docs/schemas/domaincommon.rng | 5 +++++
src/conf/domain_conf.c | 7 +++++++
src/conf/domain_conf.h | 2 ++
src/qemu/qemu_command.c | 8 ++++++++
tests/qemuxml2argvdata/audio-alsa-best.args | 1 +
tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-alsa-best.xml | 2 +-
tests/qemuxml2argvdata/audio-coreaudio-best.args | 1 +
.../audio-coreaudio-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-coreaudio-best.xml | 2 +-
tests/qemuxml2argvdata/audio-file-best.args | 1 +
tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-file-best.xml | 2 +-
tests/qemuxml2argvdata/audio-none-best.args | 1 +
tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-none-best.xml | 2 +-
tests/qemuxml2argvdata/audio-oss-best.args | 1 +
tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-oss-best.xml | 2 +-
tests/qemuxml2argvdata/audio-pulseaudio-best.args | 1 +
.../audio-pulseaudio-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-pulseaudio-best.xml | 2 +-
tests/qemuxml2argvdata/audio-sdl-best.args | 1 +
tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-sdl-best.xml | 2 +-
tests/qemuxml2argvdata/audio-spice-best.args | 1 +
.../qemuxml2argvdata/audio-spice-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-spice-best.xml | 2 +-
29 files changed, 51 insertions(+), 17 deletions(-)
--
2.31.1
3:18 a.m.
New subject: [libvirt PATCH 1/2] conf: add support for timer period audio setting
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
docs/formatdomain.rst | 6 +++++-
docs/schemas/domaincommon.rng | 5 +++++
src/conf/domain_conf.c | 7 +++++++
src/conf/domain_conf.h | 2 ++
4 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index aa7bb8da14..afee69ac97 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -6924,6 +6924,10 @@ to the guest sound device.
``id``
Integer id of the audio device. Must be greater than 0.
+``timerPeriod``
+ Timer period in microseconds. Must be greater than 0. If omitted,
+ the lowest possible period is used.
+
All the backends support child element for configuring input and
output properties
@@ -6931,7 +6935,7 @@ output properties
...
<devices>
- <audio id='1' type='pulseaudio'>
+ <audio id='1' type='pulseaudio' timerPeriod='40'>
<input mixingEngine='yes' fixedSettings='yes'
voices='1' bufferLength='100'>
<settings frequency='44100' channels='2'
format='s16'/>
</input>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 38f9d3f599..233805cb66 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -4774,6 +4774,11 @@
<attribute name="id">
<ref name="uint8"/>
</attribute>
+ <optional>
+ <attribute name="timerPeriod">
+ <ref name="uint32"/>
+ </attribute>
+ </optional>
<choice>
<group>
<attribute name="type">
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f424ed731f..7b9de2e92d 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13193,6 +13193,10 @@ virDomainAudioDefParseXML(virDomainXMLOption *xmlopt
G_GNUC_UNUSED,
&def->id) < 0)
goto error;
+ if (virXMLPropUInt(node, "timerPeriod", 10, VIR_XML_PROP_NONZERO,
+ &def->timerPeriod) < 0)
+ goto error;
+
inputNode = virXPathNode("./input", ctxt);
outputNode = virXPathNode("./output", ctxt);
@@ -25461,6 +25465,9 @@ virDomainAudioDefFormat(virBuffer *buf,
virBufferAsprintf(buf, "<audio id='%d' type='%s'",
def->id, type);
+ if (def->timerPeriod)
+ virBufferAsprintf(buf, " timerPeriod='%u'",
def->timerPeriod);
+
switch (def->type) {
case VIR_DOMAIN_AUDIO_TYPE_NONE:
break;
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 99f18c13bc..f706c498ff 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1559,6 +1559,8 @@ struct _virDomainAudioDef {
unsigned int id;
+ unsigned int timerPeriod;
+
virDomainAudioIOCommon input;
virDomainAudioIOCommon output;
union {
--
2.31.1
3:18 a.m.
New subject: [libvirt PATCH 2/2] qemu: wire up support for timer period audio setting
Closes: https://gitlab.com/libvirt/libvirt/-/issues/171
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_command.c | 8 ++++++++
tests/qemuxml2argvdata/audio-alsa-best.args | 1 +
tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-alsa-best.xml | 2 +-
tests/qemuxml2argvdata/audio-coreaudio-best.args | 1 +
.../audio-coreaudio-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-coreaudio-best.xml | 2 +-
tests/qemuxml2argvdata/audio-file-best.args | 1 +
tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-file-best.xml | 2 +-
tests/qemuxml2argvdata/audio-none-best.args | 1 +
tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-none-best.xml | 2 +-
tests/qemuxml2argvdata/audio-oss-best.args | 1 +
tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-oss-best.xml | 2 +-
tests/qemuxml2argvdata/audio-pulseaudio-best.args | 1 +
.../audio-pulseaudio-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-pulseaudio-best.xml | 2 +-
tests/qemuxml2argvdata/audio-sdl-best.args | 1 +
tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-sdl-best.xml | 2 +-
tests/qemuxml2argvdata/audio-spice-best.args | 1 +
.../qemuxml2argvdata/audio-spice-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-spice-best.xml | 2 +-
25 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 4ed82ed570..7834fc2130 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7602,6 +7602,10 @@ qemuBuildAudioCommandLineArg(virCommand *cmd,
def->id,
qemuAudioDriverTypeToString(def->type));
+ if (def->timerPeriod)
+ virBufferAsprintf(&buf, ",timer-period=%u",
+ def->timerPeriod);
+
qemuBuildAudioCommonArg(&buf, "in", &def->input);
qemuBuildAudioCommonArg(&buf, "out", &def->output);
@@ -7791,6 +7795,10 @@ qemuBuildAudioCommandLineEnv(virCommand *cmd,
virCommandAddEnvPair(cmd, "QEMU_AUDIO_DRV",
qemuAudioDriverTypeToString(audio->type));
+ if (audio->timerPeriod)
+ virCommandAddEnvFormat(cmd, "QEMU_AUDIO_TIMER_PERIOD=%u",
+ audio->timerPeriod);
+
qemuBuildAudioCommonEnv(cmd, "QEMU_AUDIO_ADC_", &audio->input);
qemuBuildAudioCommonEnv(cmd, "QEMU_AUDIO_DAC_", &audio->output);
diff --git a/tests/qemuxml2argvdata/audio-alsa-best.args
b/tests/qemuxml2argvdata/audio-alsa-best.args
index 6db6d3739f..89b0faed0d 100644
--- a/tests/qemuxml2argvdata/audio-alsa-best.args
+++ b/tests/qemuxml2argvdata/audio-alsa-best.args
@@ -7,6 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=alsa \
+QEMU_AUDIO_TIMER_PERIOD=50 \
QEMU_AUDIO_ADC_FIXED_SETTINGS=on \
QEMU_AUDIO_ADC_VOICES=1 \
QEMU_AUDIO_ADC_FIXED_FREQ=44100 \
diff --git a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args
b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args
index 9a4456e908..0fd84746db 100644
--- a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args
@@ -30,6 +30,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-blockdev
'{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
--audiodev
id=audio1,driver=alsa,in.mixing-engine=on,in.fixed-settings=on,in.voices=1,in.frequency=44100,in.channels=2,in.format=s16,out.mixing-engine=on,out.fixed-settings=on,out.voices=2,out.frequency=22050,out.channels=4,out.format=f32,in.dev=/dev/dsp0,out.dev=/dev/dsp1
\
+-audiodev
id=audio1,driver=alsa,timer-period=50,in.mixing-engine=on,in.fixed-settings=on,in.voices=1,in.frequency=44100,in.channels=2,in.format=s16,out.mixing-engine=on,out.fixed-settings=on,out.voices=2,out.frequency=22050,out.channels=4,out.format=f32,in.dev=/dev/dsp0,out.dev=/dev/dsp1
\
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-alsa-best.xml
b/tests/qemuxml2argvdata/audio-alsa-best.xml
index 1a6d5f4d9f..8fe7b2fe88 100644
--- a/tests/qemuxml2argvdata/audio-alsa-best.xml
+++ b/tests/qemuxml2argvdata/audio-alsa-best.xml
@@ -30,7 +30,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <audio id='1' type='alsa'>
+ <audio id='1' type='alsa' timerPeriod='50'>
<input mixingEngine='yes' fixedSettings='yes' voices='1'
dev='/dev/dsp0'>
<settings frequency='44100' channels='2'
format='s16'/>
</input>
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.args
b/tests/qemuxml2argvdata/audio-coreaudio-best.args
index 2e12e21c2b..1e93de83f3 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-best.args
+++ b/tests/qemuxml2argvdata/audio-coreaudio-best.args
@@ -7,6 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=coreaudio \
+QEMU_AUDIO_TIMER_PERIOD=50 \
QEMU_AUDIO_ADC_FIXED_SETTINGS=on \
QEMU_AUDIO_ADC_VOICES=1 \
QEMU_AUDIO_ADC_FIXED_FREQ=44100 \
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args
b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args
index c3d3792c8c..3d8b6f33ae 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args
@@ -30,6 +30,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-blockdev
'{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
--audiodev
id=audio1,driver=coreaudio,in.mixing-engine=on,in.fixed-settings=on,in.voices=1,in.frequency=44100,in.channels=2,in.format=s16,out.mixing-engine=on,out.fixed-settings=on,out.voices=2,out.buffer-length=200,out.frequency=22050,out.channels=4,out.format=f32,out.buffer-count=42
\
+-audiodev
id=audio1,driver=coreaudio,timer-period=50,in.mixing-engine=on,in.fixed-settings=on,in.voices=1,in.frequency=44100,in.channels=2,in.format=s16,out.mixing-engine=on,out.fixed-settings=on,out.voices=2,out.buffer-length=200,out.frequency=22050,out.channels=4,out.format=f32,out.buffer-count=42
\
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.xml
b/tests/qemuxml2argvdata/audio-coreaudio-best.xml
index 66c52bb24c..95dfb1247b 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-best.xml
+++ b/tests/qemuxml2argvdata/audio-coreaudio-best.xml
@@ -30,7 +30,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <audio id='1' type='coreaudio'>
+ <audio id='1' type='coreaudio' timerPeriod='50'>
<input mixingEngine='yes' fixedSettings='yes'
voices='1'>
<settings frequency='44100' channels='2'
format='s16'/>
</input>
diff --git a/tests/qemuxml2argvdata/audio-file-best.args
b/tests/qemuxml2argvdata/audio-file-best.args
index 8b520ef368..8c9dc220d1 100644
--- a/tests/qemuxml2argvdata/audio-file-best.args
+++ b/tests/qemuxml2argvdata/audio-file-best.args
@@ -7,6 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=wav \
+QEMU_AUDIO_TIMER_PERIOD=50 \
QEMU_AUDIO_ADC_FIXED_SETTINGS=on \
QEMU_AUDIO_ADC_VOICES=1 \
QEMU_AUDIO_ADC_FIXED_FREQ=44100 \
diff --git a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args
b/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args
index b92c0ca20d..ff48527de6 100644
--- a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args
@@ -30,6 +30,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-blockdev
'{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
--audiodev
id=audio1,driver=wav,in.mixing-engine=on,in.fixed-settings=on,in.voices=1,in.frequency=44100,in.channels=2,in.format=s16,out.mixing-engine=on,out.fixed-settings=on,out.voices=2,out.frequency=22050,out.channels=4,out.format=f32,path=audio.wav
\
+-audiodev
id=audio1,driver=wav,timer-period=50,in.mixing-engine=on,in.fixed-settings=on,in.voices=1,in.frequency=44100,in.channels=2,in.format=s16,out.mixing-engine=on,out.fixed-settings=on,out.voices=2,out.frequency=22050,out.channels=4,out.format=f32,path=audio.wav
\
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-file-best.xml
b/tests/qemuxml2argvdata/audio-file-best.xml
index 3bd02c3f37..87d5607915 100644
--- a/tests/qemuxml2argvdata/audio-file-best.xml
+++ b/tests/qemuxml2argvdata/audio-file-best.xml
@@ -30,7 +30,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <audio id='1' type='file' path='audio.wav'>
+ <audio id='1' type='file' timerPeriod='50'
path='audio.wav'>
<input mixingEngine='yes' fixedSettings='yes'
voices='1'>
<settings frequency='44100' channels='2'
format='s16'/>
</input>
diff --git a/tests/qemuxml2argvdata/audio-none-best.args
b/tests/qemuxml2argvdata/audio-none-best.args
index 2f95ff5bfb..f75701dccd 100644
--- a/tests/qemuxml2argvdata/audio-none-best.args
+++ b/tests/qemuxml2argvdata/audio-none-best.args
@@ -7,6 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
+QEMU_AUDIO_TIMER_PERIOD=50 \
QEMU_AUDIO_ADC_FIXED_SETTINGS=on \
QEMU_AUDIO_ADC_VOICES=1 \
QEMU_AUDIO_ADC_FIXED_FREQ=44100 \
diff --git a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args
b/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args
index d80a47407b..feaa72ddbd 100644
--- a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args
@@ -30,6 +30,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-blockdev
'{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
--audiodev
id=audio1,driver=none,in.mixing-engine=on,in.fixed-settings=on,in.voices=1,in.frequency=44100,in.channels=2,in.format=s16,out.mixing-engine=on,out.fixed-settings=on,out.voices=2,out.frequency=22050,out.channels=4,out.format=f32
\
+-audiodev
id=audio1,driver=none,timer-period=50,in.mixing-engine=on,in.fixed-settings=on,in.voices=1,in.frequency=44100,in.channels=2,in.format=s16,out.mixing-engine=on,out.fixed-settings=on,out.voices=2,out.frequency=22050,out.channels=4,out.format=f32
\
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-none-best.xml
b/tests/qemuxml2argvdata/audio-none-best.xml
index df79f705ac..b867d20fb2 100644
--- a/tests/qemuxml2argvdata/audio-none-best.xml
+++ b/tests/qemuxml2argvdata/audio-none-best.xml
@@ -30,7 +30,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <audio id='1' type='none'>
+ <audio id='1' type='none' timerPeriod='50'>
<input mixingEngine='yes' fixedSettings='yes'
voices='1'>
<settings frequency='44100' channels='2'
format='s16'/>
</input>
diff --git a/tests/qemuxml2argvdata/audio-oss-best.args
b/tests/qemuxml2argvdata/audio-oss-best.args
index 0088a28094..acc66ab91f 100644
--- a/tests/qemuxml2argvdata/audio-oss-best.args
+++ b/tests/qemuxml2argvdata/audio-oss-best.args
@@ -7,6 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=oss \
+QEMU_AUDIO_TIMER_PERIOD=50 \
QEMU_AUDIO_ADC_FIXED_SETTINGS=on \
QEMU_AUDIO_ADC_VOICES=1 \
QEMU_AUDIO_ADC_FIXED_FREQ=44100 \
diff --git a/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args
b/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args
index 4fd6091ca6..b66fa68bc8 100644
--- a/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args
@@ -30,6 +30,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-blockdev
'{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
--audiodev
id=audio1,driver=oss,in.mixing-engine=on,in.fixed-settings=on,in.voices=1,in.frequency=44100,in.channels=2,in.format=s16,out.mixing-engine=on,out.fixed-settings=on,out.voices=2,out.frequency=22050,out.channels=4,out.format=f32,in.dev=/dev/dsp0,in.buffer-count=30,in.try-poll=on,out.dev=/dev/dsp1,out.buffer-count=30,out.try-poll=off
\
+-audiodev
id=audio1,driver=oss,timer-period=50,in.mixing-engine=on,in.fixed-settings=on,in.voices=1,in.frequency=44100,in.channels=2,in.format=s16,out.mixing-engine=on,out.fixed-settings=on,out.voices=2,out.frequency=22050,out.channels=4,out.format=f32,in.dev=/dev/dsp0,in.buffer-count=30,in.try-poll=on,out.dev=/dev/dsp1,out.buffer-count=30,out.try-poll=off
\
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-oss-best.xml
b/tests/qemuxml2argvdata/audio-oss-best.xml
index 0561724dbe..bf2fefdac2 100644
--- a/tests/qemuxml2argvdata/audio-oss-best.xml
+++ b/tests/qemuxml2argvdata/audio-oss-best.xml
@@ -30,7 +30,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <audio id='1' type='oss'>
+ <audio id='1' type='oss' timerPeriod='50'>
<input mixingEngine='yes' fixedSettings='yes' voices='1'
dev='/dev/dsp0' bufferCount='30' tryPoll='yes'>
<settings frequency='44100' channels='2'
format='s16'/>
</input>
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.args
b/tests/qemuxml2argvdata/audio-pulseaudio-best.args
index 767c87f2df..e22816777d 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-best.args
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.args
@@ -7,6 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=pa \
+QEMU_AUDIO_TIMER_PERIOD=50 \
QEMU_AUDIO_ADC_FIXED_SETTINGS=on \
QEMU_AUDIO_ADC_VOICES=1 \
QEMU_AUDIO_ADC_FIXED_FREQ=44100 \
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args
b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args
index 2044b89936..eabff7302f 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args
@@ -30,6 +30,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-blockdev
'{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
--audiodev
id=audio1,driver=pa,in.mixing-engine=on,in.fixed-settings=on,in.voices=1,...
\
+-audiodev
id=audio1,driver=pa,timer-period=50,in.mixing-engine=on,in.fixed-settings...
\
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.xml
b/tests/qemuxml2argvdata/audio-pulseaudio-best.xml
index bfc4b92e9b..8fd1ca7497 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-best.xml
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.xml
@@ -30,7 +30,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <audio id='1' type='pulseaudio'
serverName='acme.example.org'>
+ <audio id='1' type='pulseaudio' timerPeriod='50'
serverName='acme.example.org'>
<input mixingEngine='yes' fixedSettings='yes' voices='1'
bufferLength='200' name='fish'>
<settings frequency='44100' channels='2'
format='s16'/>
</input>
diff --git a/tests/qemuxml2argvdata/audio-sdl-best.args
b/tests/qemuxml2argvdata/audio-sdl-best.args
index 75e6412825..5634d463e5 100644
--- a/tests/qemuxml2argvdata/audio-sdl-best.args
+++ b/tests/qemuxml2argvdata/audio-sdl-best.args
@@ -7,6 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=sdl \
+QEMU_AUDIO_TIMER_PERIOD=50 \
QEMU_AUDIO_ADC_FIXED_SETTINGS=on \
QEMU_AUDIO_ADC_VOICES=1 \
QEMU_AUDIO_ADC_FIXED_FREQ=44100 \
diff --git a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args
b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args
index c4c60772a2..4c8d46598a 100644
--- a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args
@@ -31,6 +31,6 @@ SDL_AUDIODRIVER=pulseaudio \
-blockdev
'{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
--audiodev
id=audio1,driver=sdl,in.mixing-engine=on,in.fixed-settings=on,in.voices=1,in.frequency=44100,in.channels=2,in.format=s16,out.mixing-engine=on,out.fixed-settings=on,out.voices=2,out.buffer-length=200,out.frequency=22050,out.channels=4,out.format=f32
\
+-audiodev
id=audio1,driver=sdl,timer-period=50,in.mixing-engine=on,in.fixed-settings=on,in.voices=1,in.frequency=44100,in.channels=2,in.format=s16,out.mixing-engine=on,out.fixed-settings=on,out.voices=2,out.buffer-length=200,out.frequency=22050,out.channels=4,out.format=f32
\
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-sdl-best.xml
b/tests/qemuxml2argvdata/audio-sdl-best.xml
index 29523590af..79917742f1 100644
--- a/tests/qemuxml2argvdata/audio-sdl-best.xml
+++ b/tests/qemuxml2argvdata/audio-sdl-best.xml
@@ -30,7 +30,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <audio id='1' type='sdl' driver='pulseaudio'>
+ <audio id='1' type='sdl' timerPeriod='50'
driver='pulseaudio'>
<input mixingEngine='yes' fixedSettings='yes'
voices='1'>
<settings frequency='44100' channels='2'
format='s16'/>
</input>
diff --git a/tests/qemuxml2argvdata/audio-spice-best.args
b/tests/qemuxml2argvdata/audio-spice-best.args
index b295aef236..cdb4854816 100644
--- a/tests/qemuxml2argvdata/audio-spice-best.args
+++ b/tests/qemuxml2argvdata/audio-spice-best.args
@@ -7,6 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
+QEMU_AUDIO_TIMER_PERIOD=50 \
QEMU_AUDIO_ADC_FIXED_SETTINGS=on \
QEMU_AUDIO_ADC_VOICES=1 \
QEMU_AUDIO_ADC_FIXED_FREQ=44100 \
diff --git a/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args
b/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args
index 6f0c04d106..4b1d4a2ece 100644
--- a/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args
@@ -30,6 +30,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-blockdev
'{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
--audiodev
id=audio1,driver=spice,in.mixing-engine=on,in.fixed-settings=on,in.voices=1,in.frequency=44100,in.channels=2,in.format=s16,out.mixing-engine=on,out.fixed-settings=on,out.voices=2,out.frequency=22050,out.channels=4,out.format=f32
\
+-audiodev
id=audio1,driver=spice,timer-period=50,in.mixing-engine=on,in.fixed-settings=on,in.voices=1,in.frequency=44100,in.channels=2,in.format=s16,out.mixing-engine=on,out.fixed-settings=on,out.voices=2,out.frequency=22050,out.channels=4,out.format=f32
\
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-spice-best.xml
b/tests/qemuxml2argvdata/audio-spice-best.xml
index a53586032a..8d203c9089 100644
--- a/tests/qemuxml2argvdata/audio-spice-best.xml
+++ b/tests/qemuxml2argvdata/audio-spice-best.xml
@@ -30,7 +30,7 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <audio id='1' type='spice'>
+ <audio id='1' type='spice' timerPeriod='50'>
<input mixingEngine='yes' fixedSettings='yes'
voices='1'>
<settings frequency='44100' channels='2'
format='s16'/>
</input>
--
2.31.1
6:16 a.m.
On 6/3/21 10:18 AM, Daniel P. Berrangé wrote:
Somehow I missed this one property during initial impl of audio
Daniel P. Berrangé (2):
conf: add support for timer period audio setting
qemu: wire up support for timer period audio setting
docs/formatdomain.rst | 6 +++++-
docs/schemas/domaincommon.rng | 5 +++++
src/conf/domain_conf.c | 7 +++++++
src/conf/domain_conf.h | 2 ++
src/qemu/qemu_command.c | 8 ++++++++
tests/qemuxml2argvdata/audio-alsa-best.args | 1 +
tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-alsa-best.xml | 2 +-
tests/qemuxml2argvdata/audio-coreaudio-best.args | 1 +
.../audio-coreaudio-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-coreaudio-best.xml | 2 +-
tests/qemuxml2argvdata/audio-file-best.args | 1 +
tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-file-best.xml | 2 +-
tests/qemuxml2argvdata/audio-none-best.args | 1 +
tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-none-best.xml | 2 +-
tests/qemuxml2argvdata/audio-oss-best.args | 1 +
tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-oss-best.xml | 2 +-
tests/qemuxml2argvdata/audio-pulseaudio-best.args | 1 +
.../audio-pulseaudio-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-pulseaudio-best.xml | 2 +-
tests/qemuxml2argvdata/audio-sdl-best.args | 1 +
tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-sdl-best.xml | 2 +-
tests/qemuxml2argvdata/audio-spice-best.args | 1 +
.../qemuxml2argvdata/audio-spice-best.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/audio-spice-best.xml | 2 +-
29 files changed, 51 insertions(+), 17 deletions(-)
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Michal
1268
days inactive
1268
days old
3 comments
2 participants
participants (2)
-
Daniel P. Berrangé -
Michal Prívozník