domain_conf: make virDomainDiskSetDriver() void

The function only returns zero or aborts, so it might as well be void.
This has the added benefit of simplifying the code that calls it.

Signed-off-by: Matt Coleman <matt@datto.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d84d0327ad1840d9521eadd88289e4cb33e06988..f05a6cb2253b5269609c6941e983d3cbb7ce8cdb 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2270,13 +2270,12 @@ virDomainDiskGetDriver(const virDomainDiskDef *def)
 }
 
 
-int
+void
 virDomainDiskSetDriver(virDomainDiskDefPtr def, const char *name)
 {
     char *tmp = g_strdup(name);
     g_free(def->driverName);
     def->driverName = tmp;
-    return 0;
 }
 
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 9fc584145745808160e5e4333d7593ec316cf0b0..4cd6bcd01d963ec5bdb266cefa4ff9153d7d69f0 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3043,8 +3043,7 @@ const char *virDomainDiskGetSource(virDomainDiskDef const *def);
 void virDomainDiskSetSource(virDomainDiskDefPtr def, const char *src);
 void virDomainDiskEmptySource(virDomainDiskDefPtr def);
 const char *virDomainDiskGetDriver(const virDomainDiskDef *def);
-int virDomainDiskSetDriver(virDomainDiskDefPtr def, const char *name)
-    G_GNUC_WARN_UNUSED_RESULT;
+void virDomainDiskSetDriver(virDomainDiskDefPtr def, const char *name);
 int virDomainDiskGetFormat(virDomainDiskDefPtr def);
 void virDomainDiskSetFormat(virDomainDiskDefPtr def, int format);
 virDomainControllerDefPtr

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 43d23565f1c86a1f9e9c4ec10ced5368923bb6ea..383f2295a2e6ada0801897a2a0478973e4febb15 100644 (file)
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -1237,7 +1237,7 @@ libxlUpdateDiskDef(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)
         break;
     }
     if (driver)
-        ignore_value(virDomainDiskSetDriver(l_disk, driver));
+        virDomainDiskSetDriver(l_disk, driver);
 }
 
 int

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index a3f362a0c8c349a2b4b412be21cc943c7547b13d..3669b358f62685a115727bfb168f2b24602c57aa 100644 (file)
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -361,9 +361,8 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
 
         /* for network-based disks, set 'qemu' as the default driver */
         if (actual_type == VIR_STORAGE_TYPE_NETWORK) {
-            if (!virDomainDiskGetDriver(disk) &&
-                virDomainDiskSetDriver(disk, "qemu") < 0)
-                return -1;
+            if (!virDomainDiskGetDriver(disk))
+                virDomainDiskSetDriver(disk, "qemu");
         }
 
         /* xl.cfg default format is raw. See xl-disk-configuration(5) */

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 00a74dcb49838fd885ab52db6a1403ca6829a482..2195ecf47bd7f76adbd3cbd1d79f1a0472ca85e0 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -4086,8 +4086,7 @@ libxlDomainUpdateDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev)
             virDomainDiskSetSource(orig, virDomainDiskGetSource(disk));
             virDomainDiskSetType(orig, virDomainDiskGetType(disk));
             virDomainDiskSetFormat(orig, virDomainDiskGetFormat(disk));
-            if (virDomainDiskSetDriver(orig, virDomainDiskGetDriver(disk)) < 0)
-                return -1;
+            virDomainDiskSetDriver(orig, virDomainDiskGetDriver(disk));
             break;
         default:
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
index d195f866c544751702d5747382cbeb8d05cf6ba9..ed0ce77db4a2c4fff239ebae290139f369c2a535 100644 (file)
--- a/src/libxl/xen_xl.c
+++ b/src/libxl/xen_xl.c
@@ -725,8 +725,7 @@ xenParseXLDisk(virConfPtr conf, virDomainDefPtr def)
             disk->removable = libxldisk->removable;
 
             if (libxldisk->is_cdrom) {
-                if (virDomainDiskSetDriver(disk, "qemu") < 0)
-                    goto fail;
+                virDomainDiskSetDriver(disk, "qemu");
 
                 virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
                 disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM;
@@ -772,21 +771,18 @@ xenParseXLDisk(virConfPtr conf, virDomainDefPtr def)
                 switch (libxldisk->backend) {
                 case LIBXL_DISK_BACKEND_QDISK:
                 case LIBXL_DISK_BACKEND_UNKNOWN:
-                    if (virDomainDiskSetDriver(disk, "qemu") < 0)
-                        goto fail;
+                    virDomainDiskSetDriver(disk, "qemu");
                     if (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_NONE)
                         virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
                     break;
 
                 case LIBXL_DISK_BACKEND_TAP:
-                    if (virDomainDiskSetDriver(disk, "tap") < 0)
-                        goto fail;
+                    virDomainDiskSetDriver(disk, "tap");
                     virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
                     break;
 
                 case LIBXL_DISK_BACKEND_PHY:
-                    if (virDomainDiskSetDriver(disk, "phy") < 0)
-                        goto fail;
+                    virDomainDiskSetDriver(disk, "phy");
                     virDomainDiskSetType(disk, VIR_STORAGE_TYPE_BLOCK);
                     break;
                 default:

diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c
index 283ed1ee8b96d38464e1f3b725ef0cd28d496763..3e81c9ef0d459623e888e5b8ca29c8ee3877145c 100644 (file)
--- a/src/libxl/xen_xm.c
+++ b/src/libxl/xen_xm.c
@@ -165,10 +165,7 @@ xenParseXMDisk(char *entry, int hvm)
             len = tmp - src;
             tmp = g_strndup(src, len);
 
-            if (virDomainDiskSetDriver(disk, tmp) < 0) {
-                VIR_FREE(tmp);
-                goto error;
-            }
+            virDomainDiskSetDriver(disk, tmp);
             VIR_FREE(tmp);
 
             /* Strip the prefix we found off the source file name */
@@ -208,9 +205,8 @@ xenParseXMDisk(char *entry, int hvm)
     }
 
     /* No source, or driver name, so fix to phy: */
-    if (!virDomainDiskGetDriver(disk) &&
-        virDomainDiskSetDriver(disk, "phy") < 0)
-        goto error;
+    if (!virDomainDiskGetDriver(disk))
+        virDomainDiskSetDriver(disk, "phy");
 
     /* phy: type indicates a block device */
     virDomainDiskSetType(disk,

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 02b5e7422c33921b708694a6807bb6dc042ee2c2..70896ad80ee027f2d99d1b60b673fe07e55efeaa 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5086,9 +5086,8 @@ qemuDomainDeviceDiskDefPostParse(virDomainDiskDefPtr disk,
                                  unsigned int parseFlags)
 {
     /* set default disk types and drivers */
-    if (!virDomainDiskGetDriver(disk) &&
-        virDomainDiskSetDriver(disk, "qemu") < 0)
-        return -1;
+    if (!virDomainDiskGetDriver(disk))
+        virDomainDiskSetDriver(disk, "qemu");
 
     /* default disk format for drives */
     if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_NONE &&

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 6a0ab5c86285909549da97a525a053f845dd0350..cdd3f61ee12305595cb4d84307d9172419f0cff3 100644 (file)
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -698,8 +698,7 @@ prlsdkGetDiskInfo(vzDriverPtr driver,
             VIR_FREE(disk->serial);
     }
 
-    if (virDomainDiskSetDriver(disk, "vz") < 0)
-        goto cleanup;
+    virDomainDiskSetDriver(disk, "vz");
 
     if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) {
         pret = PrlVmDevHd_GetDiskSize(prldisk, &size);