[libvirt] [PATCH 38/75] bhyve: Use g_strdup_printf() instead of virAsprintf()

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- src/bhyve/bhyve_capabilities.c | 4 ++-- src/bhyve/bhyve_process.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 2f03bd6131..a533692517 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -159,8 +159,8 @@ virBhyveDomainCapsBuild(bhyveConnPtr conn, firmwares_alloc, firmwares->nvalues, 1) < 0) goto cleanup; - virAsprintf(&firmwares->values[firmwares->nvalues], "%s/%s", - firmware_dir, entry->d_name); + firmwares->values[firmwares->nvalues] = g_strdup_printf("%s/%s", + firmware_dir, entry->d_name); firmwares->nvalues++; } diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 17e32176d9..7e2631f6ea 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -89,7 +89,7 @@ bhyveNetCleanup(virDomainObjPtr vm) static void virBhyveFormatDevMapFile(const char *vm_name, char **fn_out) { - virAsprintf(fn_out, "%s/grub_bhyve-%s-device.map", BHYVE_STATE_DIR, vm_name); + *fn_out, = g_strdup_printf("%s/grub_bhyve-%s-device.map", BHYVE_STATE_DIR, vm_name); } int @@ -112,7 +112,7 @@ virBhyveProcessStart(virConnectPtr conn, int ret = -1, rc; virCapsPtr caps = NULL; - virAsprintf(&logfile, "%s/%s.log", BHYVE_LOG_DIR, vm->def->name); + logfile = g_strdup_printf("%s/%s.log", BHYVE_LOG_DIR, vm->def->name); caps = bhyveDriverGetCapabilities(privconn); if (!caps) @@ -403,7 +403,7 @@ virBhyveProcessReconnect(virDomainObjPtr vm, if (kp == NULL || nprocs != 1) goto cleanup; - virAsprintf(&expected_proctitle, "bhyve: %s", vm->def->name); + expected_proctitle = g_strdup_printf("bhyve: %s", vm->def->name); proc_argv = kvm_getargv(data->kd, kp, 0); if (proc_argv && proc_argv[0]) { -- 2.21.0