External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: rename and improve virDomainDefFindAudioForSound

Browse Source 
The virDomainDefFindAudioForSound only takes a virDomainSoundDefPtr as
its arg, but we want to use the same functionality for VNC graphics.
In addition if audio ID is zero, then we want to return the first
available audio backend.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-03-03 18:06:17 +00:00
parent 562a495b92
commit efdab67f44
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bhyve/bhyve_command.c
View File

@ -765,7 +765,7 @@ virBhyveProcessBuildBhyveCmd(bhyveConnPtr driver, virDomainDefPtr def,
for (i = 0; i < def->nsounds; i++) {
if (bhyveBuildSoundArgStr(def, def->sounds[i],
virDomainDefFindAudioForSound(def, def->sounds[i]),
virDomainDefFindAudioByID(def, def->sounds[i]->audioId),
driver, cmd) < 0)
goto error;
}

10
src/conf/domain_conf.c
View File

@ -30525,13 +30525,17 @@ virDomainDefFindDevice(virDomainDefPtr def,
virDomainAudioDefPtr
virDomainDefFindAudioForSound(virDomainDefPtr def,
virDomainSoundDefPtr sound)
virDomainDefFindAudioByID(const virDomainDef *def,
int id)
{
size_t i;
if (id != 0) {
for (i = 0; i < def->naudios; i++)
if (def->audios[i]->id == sound->audioId)
if (def->audios[i]->id == id)
return def->audios[i];
} else if (def->naudios) {
return def->audios[0];
}
return NULL;
}

4
src/conf/domain_conf.h
View File

@ -3813,8 +3813,8 @@ int virDomainDefFindDevice(virDomainDefPtr def,
bool reportError);
virDomainAudioDefPtr
virDomainDefFindAudioForSound(virDomainDefPtr def,
virDomainSoundDefPtr sound);
virDomainDefFindAudioByID(const virDomainDef *def,
int id);
bool
virDomainSoundModelSupportsCodecs(virDomainSoundDefPtr def);

2
src/libvirt_private.syms
View File

@ -300,7 +300,7 @@ virDomainDefCheckABIStability;
virDomainDefCheckABIStabilityFlags;
virDomainDefCompatibleDevice;
virDomainDefCopy;
virDomainDefFindAudioForSound;
virDomainDefFindAudioByID;
virDomainDefFindDevice;
virDomainDefFormat;
virDomainDefFormatConvertXMLFlags;