Re: [PATCH 099/103] qemuBuildSoundCommandLine: Generate via JSON

The sound devices have only the 'audiodev' property which is a string. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_command.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 324da4adc5..cf56ec3a76 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4447,15 +4447,16 @@ qemuGetAudioIDString(const virDomainDef *def, int id)

+ 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"; @@ -4478,21 +4479,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; }