virDomainShmemDef: Change type of role to virDomainShmemRole

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7f4f16505600d2d9792f738abfa09d7b9d9032db..ee9d8b2d3e3ee22f0fd43d44953703baffcc106d 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13637,12 +13637,14 @@ virDomainShmemDefParseXML(virDomainXMLOption *xmlopt,
     if (def->model != VIR_DOMAIN_SHMEM_MODEL_IVSHMEM) {
         tmp = virXMLPropString(node, "role");
         if (tmp) {
-            if ((def->role = virDomainShmemRoleTypeFromString(tmp)) <= 0) {
+            int role;
+            if ((role = virDomainShmemRoleTypeFromString(tmp)) <= 0) {
                 virReportError(VIR_ERR_XML_ERROR,
                                _("Unknown shmem role type '%s'"), tmp);
                 goto cleanup;
             }
 
+            def->role = role;
             VIR_FREE(tmp);
         }
     }

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 7120503d7731be0de0fd8bd753f6806a26b23b1d..1b028dbcf7a12640d3cef75baefc3911d0111d02 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1956,7 +1956,7 @@ struct _virDomainShmemDef {
     char *name;
     unsigned long long size;
     virDomainShmemModel model;
-    int role; /* enum virDomainShmemRole */
+    virDomainShmemRole role;
     struct {
         bool enabled;
         virDomainChrSourceDef chr;

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 455dd72cf8c7cd12a2616fade4dad5a187bd101a..d6c5308ef039fab9c3e4398e9d257ddc5a9e58da 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9003,7 +9003,7 @@ qemuBuildShmemDevStr(virDomainDef *def,
     } else {
         virBufferAsprintf(&buf, ",memdev=shmmem-%s", shmem->info.alias);
 
-        switch ((virDomainShmemRole) shmem->role) {
+        switch (shmem->role) {
         case VIR_DOMAIN_SHMEM_ROLE_MASTER:
             virBufferAddLit(&buf, ",master=on");
             break;