External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-06 18:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuBuildSoundCommandLine: Generate via JSON

Browse Source 
The sound devices have only the 'audiodev' property which is a string.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-10-05 18:35:36 +02:00
parent 870427e0c4
commit e79e862a6c
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/qemu/qemu_command.c
View File

@ -4462,15 +4462,16 @@ qemuGetAudioIDString(const virDomainDef *def, int id)
return g_strdup_printf("audio%d", audio->id);
}
static char *
qemuBuildSoundDevStr(const virDomainDef *def,
static int
qemuBuildSoundDevCmd(virCommand *cmd,
const virDomainDef *def,
virDomainSoundDef *sound,
virQEMUCaps *qemuCaps)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
g_autoptr(virJSONValue) props = NULL;
const char *model = NULL;
g_autofree char *audioid = NULL;
/* Hack for devices with different names in QEMU and libvirt */
switch (sound->model) {
case VIR_DOMAIN_SOUND_MODEL_ES1370:
model = "ES1370";
@ -4493,21 +4494,29 @@ qemuBuildSoundDevStr(const virDomainDef *def,
case VIR_DOMAIN_SOUND_MODEL_PCSPK: /* pc-speaker is handled separately */
case VIR_DOMAIN_SOUND_MODEL_ICH7:
case VIR_DOMAIN_SOUND_MODEL_LAST:
return NULL;
return -1;
}
virBufferAsprintf(&buf, "%s,id=%s", model, sound->info.alias);
if (!virDomainSoundModelSupportsCodecs(sound) &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
g_autofree char *audioid = qemuGetAudioIDString(def, sound->audioId);
if (!audioid)
return NULL;
virBufferAsprintf(&buf, ",audiodev=%s", audioid);
if (!(audioid = qemuGetAudioIDString(def, sound->audioId)))
return -1;
}
if (qemuBuildDeviceAddressStr(&buf, def, &sound->info) < 0)
return NULL;
return virBufferContentAndReset(&buf);
if (virJSONValueObjectCreate(&props,
"s:driver", model,
"s:id", sound->info.alias,
"S:audiodev", audioid,
NULL) < 0)
return -1;
if (qemuBuildDeviceAddressProps(props, def, &sound->info) < 0)
return -1;
if (qemuBuildDeviceCommandlineFromJSON(cmd, props, qemuCaps) < 0)
return -1;
return 0;
}
@ -4547,7 +4556,6 @@ qemuBuildSoundCommandLine(virCommand *cmd,
for (i = 0; i < def->nsounds; i++) {
virDomainSoundDef *sound = def->sounds[i];
g_autofree char *str = NULL;
/* Sadly pcspk device doesn't use -device syntax. Fortunately
* we don't need to set any PCI address on it, so we don't
@ -4558,11 +4566,9 @@ qemuBuildSoundCommandLine(virCommand *cmd,
if (qemuCommandAddExtDevice(cmd, &sound->info, qemuCaps) < 0)
return -1;
virCommandAddArg(cmd, "-device");
if (!(str = qemuBuildSoundDevStr(def, sound, qemuCaps)))
if (qemuBuildSoundDevCmd(cmd, def, sound, qemuCaps) < 0)
return -1;
virCommandAddArg(cmd, str);
if (virDomainSoundModelSupportsCodecs(sound)) {
for (j = 0; j < sound->ncodecs; j++) {
g_autofree char *codecstr = NULL;