[libvirt] [PATCH libvirt 3/5] qemu: honour sound <codec> sub-elements
With ICH6 audio device, allow to specify codecs.
By default, for compatibility reasons, if no codec is specified,
"hda-duplex" will be used.
---
src/qemu/qemu_command.c | 74 +++++++++++++++++++++++++++++++++++------------
1 file changed, 56 insertions(+), 18 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 070d13e..cf97b48 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -89,6 +89,12 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
"", /* don't support vbox */
"qxl");
+VIR_ENUM_DECL(qemuSoundCodec)
+
+VIR_ENUM_IMPL(qemuSoundCodec, VIR_DOMAIN_SOUND_CODEC_TYPE_LAST,
+ "hda-duplex",
+ "hda-micro");
+
VIR_ENUM_DECL(qemuControllerModelUSB)
VIR_ENUM_IMPL(qemuControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST,
@@ -2958,21 +2964,43 @@ error:
return NULL;
}
+
+static int
+qemuSoundCodecTypeToCaps(int type)
+{
+ switch (type) {
+ case VIR_DOMAIN_SOUND_CODEC_TYPE_DUPLEX:
+ return QEMU_CAPS_HDA_DUPLEX;
+ case VIR_DOMAIN_SOUND_CODEC_TYPE_MICRO:
+ return QEMU_CAPS_HDA_MICRO;
+ default:
+ return -1;
+ }
+}
+
+
static char *
qemuBuildSoundCodecStr(virDomainSoundDefPtr sound,
- const char *codec)
+ virDomainSoundCodecDefPtr codec,
+ virBitmapPtr qemuCaps)
{
virBuffer buf = VIR_BUFFER_INITIALIZER;
- int cad = 0;
+ const char *stype;
+ int type, caps;
- virBufferAsprintf(&buf, "%s,id=%s-codec%d,bus=%s.0,cad=%d",
- codec, sound->info.alias, cad, sound->info.alias, cad);
+ type = codec->type;
+ stype = qemuSoundCodecTypeToString(type);
+ caps = qemuSoundCodecTypeToCaps(type);
- if (virBufferError(&buf)) {
- virReportOOMError();
+ if (caps == -1 || !qemuCapsGet(qemuCaps, caps)) {
+ qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("%s not supported in this QEMU binary"), stype);
goto error;
}
+ virBufferAsprintf(&buf, "%s,id=%s-codec%d,bus=%s.0,cad=%d",
+ stype, sound->info.alias, codec->cad, sound->info.alias,
codec->cad);
+
return virBufferContentAndReset(&buf);
error:
@@ -5721,20 +5749,30 @@ qemuBuildCommandLine(virConnectPtr conn,
if (sound->model == VIR_DOMAIN_SOUND_MODEL_ICH6) {
char *codecstr = NULL;
- if (!qemuCapsGet(qemuCaps, QEMU_CAPS_HDA_DUPLEX)) {
- qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("this QEMU binary lacks hda support"));
- goto error;
- }
+ int ii;
- virCommandAddArg(cmd, "-device");
- if (!(codecstr = qemuBuildSoundCodecStr(sound,
- "hda-duplex"))) {
- goto error;
- }
+ for (ii = 0 ; ii < sound->ncodecs ; ii++) {
+ virCommandAddArg(cmd, "-device");
+ if (!(codecstr = qemuBuildSoundCodecStr(sound,
sound->codecs[ii], qemuCaps))) {
+ goto error;
- virCommandAddArg(cmd, codecstr);
- VIR_FREE(codecstr);
+ }
+ virCommandAddArg(cmd, codecstr);
+ VIR_FREE(codecstr);
+ }
+ if (ii == 0) {
+ virDomainSoundCodecDef codec = {
+ VIR_DOMAIN_SOUND_CODEC_TYPE_DUPLEX,
+ 0
+ };
+ virCommandAddArg(cmd, "-device");
+ if (!(codecstr = qemuBuildSoundCodecStr(sound, &codec,
qemuCaps))) {
+ goto error;
+
+ }
+ virCommandAddArg(cmd, codecstr);
+ VIR_FREE(codecstr);
+ }
}
VIR_FREE(str);
--
1.7.10