]> xenbits.xensource.com Git - libvirt.git/commitdiff
conf: disk: Avoid temporary variable when parsing driver name
authorPeter Krempa <pkrempa@redhat.com>
Wed, 20 Apr 2016 13:08:52 +0000 (15:08 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 21 Apr 2016 15:04:06 +0000 (17:04 +0200)
src/conf/domain_conf.c

index 43a90a35f9f23b9509380900aff2dd2442e9c0dc..21a904d3572499366df80b2cc258e0abdea66d25 100644 (file)
@@ -6919,7 +6919,6 @@ static int
 virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
                                xmlNodePtr cur)
 {
-    char *driverName = NULL;
     char *driverType = NULL;
     char *cachetag = NULL;
     char *error_policy = NULL;
@@ -6932,7 +6931,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
     char *driverIOThread = NULL;
     int ret = -1;
 
-    driverName = virXMLPropString(cur, "name");
+    def->src->driverName = virXMLPropString(cur, "name");
     driverType = virXMLPropString(cur, "type");
     if (STREQ_NULLABLE(driverType, "aio")) {
         /* In-place conversion to "raw", for Xen back-compat */
@@ -6950,9 +6949,6 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
     discard = virXMLPropString(cur, "discard");
     driverIOThread = virXMLPropString(cur, "iothread");
 
-    def->src->driverName = driverName;
-    driverName = NULL;
-
     if (cachetag &&
         (def->cachemode = virDomainDiskCacheTypeFromString(cachetag)) < 0) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -7051,7 +7047,6 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
 
  cleanup:
     VIR_FREE(driverType);
-    VIR_FREE(driverName);
     VIR_FREE(cachetag);
     VIR_FREE(error_policy);
     VIR_FREE(rerror_policy);