From: Tim Wiederhake <twiederh@redhat.com>
Date: Wed, 19 May 2021 14:10:05 +0000 (+0200)
Subject: virDomainAudioDef: Change type of "sdl.driver" to virDomainAudioSDLDriver
X-Git-Tag: v7.4.0-rc1~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1d589509ad946768bc0ee06b4e98291c5862446;p=thirdparty%2Flibvirt.git

virDomainAudioDef: Change type of "sdl.driver" to virDomainAudioSDLDriver

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 758f699c2c..e44989de9f 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13236,15 +13236,16 @@ virDomainAudioDefParseXML(virDomainXMLOption *xmlopt G_GNUC_UNUSED,
         break;
 
     case VIR_DOMAIN_AUDIO_TYPE_SDL: {
-        g_autofree char *driver = virXMLPropString(node, "driver");
-        if (driver &&
-            (def->backend.sdl.driver =
-             virDomainAudioSDLDriverTypeFromString(driver)) <= 0) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("unknown SDL driver '%s'"), driver);
-            goto error;
+        g_autofree char *driverstr = virXMLPropString(node, "driver");
+        int driver;
+        if (driverstr) {
+            if ((driver = virDomainAudioSDLDriverTypeFromString(driverstr)) <= 0) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("unknown SDL driver '%s'"), driverstr);
+                goto error;
+            }
+            def->backend.sdl.driver = driver;
         }
-
         if (inputNode)
             virDomainAudioSDLParse(&def->backend.sdl.input, inputNode);
         if (outputNode)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 462c61a807..fab856a5c7 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1578,7 +1578,7 @@ struct _virDomainAudioDef {
         struct {
             virDomainAudioIOSDL input;
             virDomainAudioIOSDL output;
-            int driver; /* virDomainAudioSDLDriver */
+            virDomainAudioSDLDriver driver;
         } sdl;
         struct {
             char *path;