virDomainSoundDef: Change type of model to virDomainSoundModel

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 5cadbacea6ea55bad045b2150eb00aa6d22734da..9d98f487ead59f89159a69be461907dea2642dac 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13307,17 +13307,19 @@ virDomainSoundDefParseXML(virDomainXMLOption *xmlopt,
     virDomainSoundDef *def;
     VIR_XPATH_NODE_AUTORESTORE(ctxt)
     g_autofree char *model = NULL;
+    int modelval;
     xmlNodePtr audioNode;
 
     def = g_new0(virDomainSoundDef, 1);
     ctxt->node = node;
 
     model = virXMLPropString(node, "model");
-    if ((def->model = virDomainSoundModelTypeFromString(model)) < 0) {
+    if ((modelval = virDomainSoundModelTypeFromString(model)) < 0) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("unknown sound model '%s'"), model);
         goto error;
     }
+    def->model = modelval;
 
     if (virDomainSoundModelSupportsCodecs(def)) {
         int ncodecs;

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 4838687edf97a505e6ba78be02e4241cf48b2f0d..ede80ac322da049146d3acfb0d18bf46c69bb041 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1449,7 +1449,7 @@ struct _virDomainSoundCodecDef {
 };
 
 struct _virDomainSoundDef {
-    int model;
+    virDomainSoundModel model;
     virDomainDeviceInfo info;
 
     size_t ncodecs;

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index be93182092813f4bba089b59392b6fa8f804bd84..d7f1c715b6a72a342e4f092bb065ad26d5924c69 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4133,7 +4133,7 @@ qemuBuildSoundDevStr(const virDomainDef *def,
     const char *model = NULL;
 
     /* Hack for devices with different names in QEMU and libvirt */
-    switch ((virDomainSoundModel) sound->model) {
+    switch (sound->model) {
     case VIR_DOMAIN_SOUND_MODEL_ES1370:
         model = "ES1370";
         break;

diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index a73f30ddcb8aca42756c2c5fc1879158183861dc..e66efb3d1fae3299899a73163a5847a2d7d3971d 100644 (file)
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -759,7 +759,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev,
     }
 
     case VIR_DOMAIN_DEVICE_SOUND:
-        switch ((virDomainSoundModel) dev->data.sound->model) {
+        switch (dev->data.sound->model) {
         case VIR_DOMAIN_SOUND_MODEL_ES1370:
         case VIR_DOMAIN_SOUND_MODEL_AC97:
         case VIR_DOMAIN_SOUND_MODEL_ICH6:

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 255d653118efc5e1219e0726706ae66f48ffcd3d..774426bcebf37494659f5188394740141476ca22 100644 (file)
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -4385,7 +4385,7 @@ qemuValidateDomainDeviceDefSound(virDomainSoundDef *sound,
 {
     size_t i;
 
-    switch ((virDomainSoundModel) sound->model) {
+    switch (sound->model) {
     case VIR_DOMAIN_SOUND_MODEL_USB:
         if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_USB_AUDIO)) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",