libxl: adjust 'ich6' sound card name

Xen 4.17 has strict parsing of 'soundhw' option that allows only
specific values (instead of passing through any value directly to
qemu's -soundhw option, it uses -device now). For 'intel-hda' audio
device, it requires "hda" string. "hda" works with older libxl too.
Other supported models are the same as in libvirt XML.

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index d13e48abb2c1c7e79a285745196032644d962942..17ac88063477efa9da8eeb62f05ea83bfbfcfd50 100644 (file)
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -592,8 +592,12 @@ libxlMakeDomBuildInfo(virDomainDef *def,
              * a single device.  From the man page: soundhw=DEVICE
              */
             virDomainSoundDef *snd = def->sounds[0];
+            const char *model = virDomainSoundModelTypeToString(snd->model);
 
-            b_info->u.hvm.soundhw = g_strdup(virDomainSoundModelTypeToString(snd->model));
+            if (snd->model == VIR_DOMAIN_SOUND_MODEL_ICH6)
+                model = "hda";
+
+            b_info->u.hvm.soundhw = g_strdup(model);
         }
 
         for (i = 0; i < def->os.nBootDevs; i++) {