]> xenbits.xensource.com Git - libvirt.git/commitdiff
conf: Drop needless setting of VIR_DOMAIN_TPM_VERSION_DEFAULT
authorMichal Privoznik <mprivozn@redhat.com>
Mon, 18 Jul 2022 07:58:38 +0000 (09:58 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Mon, 1 Aug 2022 15:35:51 +0000 (17:35 +0200)
In previous commit the VIR_DOMAIN_TPM_VERSION_DEFAULT value was
made just an alias to value of 0. And since all newly allocated
memory is zeroed out (due to use of g_new0()), the def->version
inside of virDomainTPMDefParseXML() is also 0 and thus there is
no need to set it explicitly.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
src/conf/domain_conf.c

index bc8dedf81758435488892727fe2ac74f948af189..7509fcf88e00b3c7015f9176f7ea9b47be6e23c9 100644 (file)
@@ -10414,15 +10414,12 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
     }
 
     version = virXMLPropString(backends[0], "version");
-    if (!version) {
-        def->version = VIR_DOMAIN_TPM_VERSION_DEFAULT;
-    } else {
-        if ((def->version = virDomainTPMVersionTypeFromString(version)) <= 0) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("Unsupported TPM version '%s'"),
-                           version);
-            goto error;
-        }
+    if (version &&
+        (def->version = virDomainTPMVersionTypeFromString(version)) <= 0) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("Unsupported TPM version '%s'"),
+                       version);
+        goto error;
     }
 
     switch (def->type) {