diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 7ef55f45e9..148ae15fed 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -113,8 +113,7 @@ nodeDeviceUpdateDriverName(virNodeDeviceDefPtr def) VIR_FREE(def->driver); - if (virAsprintf(&driver_link, "%s/driver", def->sysfs_path) < 0) - goto cleanup; + driver_link = g_strdup_printf("%s/driver", def->sysfs_path); /* Some devices don't have an explicit driver, so just return without a name */ diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 688a0e0f06..b40f93df46 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -614,16 +614,13 @@ nodeStateInitialize(bool privileged G_GNUC_UNUSED, nodeDeviceLock(); if (privileged) { - if (virAsprintf(&driver->stateDir, - "%s/libvirt/nodedev", RUNSTATEDIR) < 0) - goto failure; + driver->stateDir = g_strdup_printf("%s/libvirt/nodedev", RUNSTATEDIR); } else { g_autofree char *rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto failure; - if (virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir) < 0) - goto failure; + driver->stateDir = g_strdup_printf("%s/nodedev/run", rundir); } if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index e3c81057f0..29cd0ea573 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1025,9 +1025,7 @@ udevProcessMediatedDevice(struct udev_device *dev, * it by waiting for the attributes to become available. */ - if (virAsprintf(&linkpath, "%s/mdev_type", - udev_device_get_syspath(dev)) < 0) - goto cleanup; + linkpath = g_strdup_printf("%s/mdev_type", udev_device_get_syspath(dev)); if (virFileWaitForExists(linkpath, 1, 100) < 0) { virReportSystemError(errno, @@ -1809,16 +1807,13 @@ nodeStateInitialize(bool privileged, driver->privileged = privileged; if (privileged) { - if (virAsprintf(&driver->stateDir, - "%s/libvirt/nodedev", RUNSTATEDIR) < 0) - goto cleanup; + driver->stateDir = g_strdup_printf("%s/libvirt/nodedev", RUNSTATEDIR); } else { g_autofree char *rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto cleanup; - if (virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir) < 0) - goto cleanup; + driver->stateDir = g_strdup_printf("%s/nodedev/run", rundir); } if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) {