On Tue, Mar 09, 2021 at 04:30:18PM +0100, Michal Privoznik wrote:
On 3/3/21 7:18 PM, Daniel P. Berrangé wrote:
> To prepare for the introduction for more backend specific audio options,
> move the OSS options into a dedicated struct and introduce separate
> helper methods for parse/format/free.
>
> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
> ---
> docs/schemas/domaincommon.rng | 17 +++++---
> src/bhyve/bhyve_command.c | 8 ++--
> src/conf/domain_conf.c | 77 ++++++++++++++++++++++++++---------
> src/conf/domain_conf.h | 9 +++-
> 4 files changed, 79 insertions(+), 32 deletions(-)
>
> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
> index d73db65742..efa1806a3a 100644
> --- a/docs/schemas/domaincommon.rng
> +++ b/docs/schemas/domaincommon.rng
> @@ -4513,6 +4513,15 @@
> </interleave>
> </element>
> </define>
> +
> + <define name="audiooss">
> + <optional>
> + <attribute name="dev">
> + <ref name="filePath"/>
This previously allowed "deviceName" only. If this change is needed please
put reasoning into commit message.
Looking into the future (next patch) - this change is needed. Please mention
it in the commit message.
Actually it isn't obviously needed - deviceName is sufficient for all
tests to pass. I'll put it back to deviceName.
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 34d1673546..d5969c79a0 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -2889,15 +2889,22 @@ void virDomainSoundDefFree(virDomainSoundDefPtr def)
> g_free(def);
> }
> -void virDomainAudioDefFree(virDomainAudioDefPtr def)
> +static void
> +virDomainAudioIOOSSFree(virDomainAudioIOOSS *def)
virDomainAudioIOOSSPtr perhaps?
I was being lazy as its less typing :-)
Reminds me to start the rfc about whether Ptr typedefs are actually
useful or not....
https://listman.redhat.com/archives/libvir-list/2021-March/msg00427.html
Regards,
Daniel
--
|:
https://berrange.com -o-
https://www.flickr.com/photos/dberrange :|
|:
https://libvirt.org -o-
https://fstop138.berrange.com :|
|:
https://entangle-photo.org -o-
https://www.instagram.com/dberrange :|