From nobody Mon Feb 9 00:07:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752885; cv=none; d=zoho.com; s=zohoarc; b=buGhojPvlto30WCxLKtWL9OyBoA73Fg+4nV1xUjuZ9xyDvA9rT+0XSz0eldEtv4o+g7x86NqZO2XHkvxIeyiXp2XDkdVlGaGdFFR3I25lDvLC4OOOR/QBgHxRu+Y/ZAqn63rD7UjsQgIyLb57lOplXS/A5bNwo3+xGjyK+8OB+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752885; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oQYqkg+AE+hTkK2wCacWJ+MpMhZXZyYWzyliPnrEAO4=; b=RN2u4nCKy5YQiWLPP9Y3sYYOJiidHh/VXSIX239ELRgIyaIh+S2Vd6nhLvLQri4dIqktbaJ5AliGRyiOWdOxOYaf9R9jNey1KCbKsdesRfkZglBOJ4Ezzz2VB+p7ggsV48OROAR+hotVS+NDR9jyWv3X/u0cC6+YIPF2f5LCMl0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752885237557.1624557588826; Tue, 22 Oct 2019 07:01:25 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-222-Xc6Onz1bOCmzCAFJs1Cggg-1; Tue, 22 Oct 2019 10:01:20 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F24C75FB; Tue, 22 Oct 2019 14:01:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AC25D6012D; Tue, 22 Oct 2019 14:01:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 350773FB45; Tue, 22 Oct 2019 14:01:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0oAe002739 for ; Tue, 22 Oct 2019 10:00:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1F2386012E; Tue, 22 Oct 2019 14:00:50 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 993AD605C3 for ; Tue, 22 Oct 2019 14:00:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752883; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=oQYqkg+AE+hTkK2wCacWJ+MpMhZXZyYWzyliPnrEAO4=; b=XXIj2N4g0xY4Uyc26QZ3fiWmU6zC6kKJ4zbylAUj0amye0f9OYq5W+qEJTetrlPHv6OsQR LVBoJybyaOth60wznaB6h/S3eTiNMzp6Z2tnlj6NOSp000FnRHm+7Yho1FD3vELb00al0j Sg7VBUONtQZroZ5hZg0u6ofTr4nvBlo= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:57 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 53/75] qemu: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: Xc6Onz1bOCmzCAFJs1Cggg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- src/qemu/qemu_agent.c | 6 +-- src/qemu/qemu_alias.c | 88 +++++++++++++++---------------- src/qemu/qemu_block.c | 30 +++++------ src/qemu/qemu_blockjob.c | 8 +-- src/qemu/qemu_capabilities.c | 8 +-- src/qemu/qemu_checkpoint.c | 8 +-- src/qemu/qemu_command.c | 72 ++++++++++++------------- src/qemu/qemu_conf.c | 90 ++++++++++++++++---------------- src/qemu/qemu_domain.c | 80 ++++++++++++++-------------- src/qemu/qemu_hotplug.c | 32 ++++++------ src/qemu/qemu_interface.c | 2 +- src/qemu/qemu_interop_config.c | 6 +-- src/qemu/qemu_migration.c | 24 ++++----- src/qemu/qemu_migration_cookie.c | 2 +- src/qemu/qemu_monitor.c | 30 +++++------ src/qemu/qemu_monitor_json.c | 14 ++--- src/qemu/qemu_monitor_text.c | 10 ++-- src/qemu/qemu_process.c | 32 ++++++------ src/qemu/qemu_slirp.c | 10 ++-- src/qemu/qemu_tpm.c | 10 ++-- src/qemu/qemu_vhost_user_gpu.c | 2 +- 21 files changed, 282 insertions(+), 282 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index d1b590d842..5a50f7f3be 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -916,8 +916,8 @@ qemuAgentGuestSync(qemuAgentPtr mon) if (virTimeMillisNow(&id) < 0) return -1; =20 - virAsprintf(&sync_msg.txBuffer, "{\"execute\":\"guest-sync\", " - "\"arguments\":{\"id\":%llu}}\n", id); + sync_msg.txBuffer =3D g_strdup_printf("{\"execute\":\"guest-sync\", " + "\"arguments\":{\"id\":%llu}}\n", = id); =20 sync_msg.txLength =3D strlen(sync_msg.txBuffer); sync_msg.sync =3D true; @@ -1118,7 +1118,7 @@ qemuAgentCommand(qemuAgentPtr mon, =20 if (!(cmdstr =3D virJSONValueToString(cmd, false))) goto cleanup; - virAsprintf(&msg.txBuffer, "%s" LINE_ENDING, cmdstr); + msg.txBuffer =3D g_strdup_printf("%s" LINE_ENDING, cmdstr); msg.txLength =3D strlen(msg.txBuffer); =20 VIR_DEBUG("Send command '%s' for write, seconds =3D %d", cmdstr, secon= ds); diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 60ab5735a4..22160a6fd8 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -114,7 +114,7 @@ qemuAssignDeviceChrAlias(virDomainDefPtr def, if (idx =3D=3D -1 && (idx =3D qemuGetNextChrDevIndex(def, chr, prefix)= ) < 0) return -1; =20 - virAsprintf(&chr->info.alias, "%s%zd", prefix, idx); + chr->info.alias =3D g_strdup_printf("%s%zd", prefix, idx); return 0; } =20 @@ -142,14 +142,14 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domai= nDef, * different naming convention ("pcie.0"), because it is * hardcoded that way in qemu. */ - virAsprintf(&controller->info.alias, "pcie.%d", controller->id= x); + controller->info.alias =3D g_strdup_printf("pcie.%d", controll= er->idx); return 0; } /* All other PCI controllers use the consistent "pci.%u" * (including the hardcoded pci-root controller on * multibus-capable qemus). */ - virAsprintf(&controller->info.alias, "pci.%d", controller->idx); + controller->info.alias =3D g_strdup_printf("pci.%d", controller->i= dx); return 0; } else if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) { /* for any machine based on e.g. I440FX or G3Beige, the @@ -179,7 +179,7 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainD= ef, /* all other controllers use the default ${type}${index} naming * scheme for alias/id. */ - virAsprintf(&controller->info.alias, "%s%d", prefix, controller->idx); + controller->info.alias =3D g_strdup_printf("%s%d", prefix, controller-= >idx); return 0; } =20 @@ -204,20 +204,20 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def, =20 if (disk->bus !=3D VIR_DOMAIN_DISK_BUS_SCSI || controllerModel =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LS= ILOGIC) { - virAsprintf(&disk->info.alias, "%s%d-%d-%d", prefix, - disk->info.addr.drive.controller, - disk->info.addr.drive.bus, - disk->info.addr.drive.unit); + disk->info.alias =3D g_strdup_printf("%s%d-%d-%d", prefix, + disk->info.addr.drive.c= ontroller, + disk->info.addr.drive.b= us, + disk->info.addr.drive.u= nit); } else { - virAsprintf(&disk->info.alias, "%s%d-%d-%d-%d", prefix, - disk->info.addr.drive.controller, - disk->info.addr.drive.bus, - disk->info.addr.drive.target, - disk->info.addr.drive.unit); + disk->info.alias =3D g_strdup_printf("%s%d-%d-%d-%d", pref= ix, + disk->info.addr.drive.c= ontroller, + disk->info.addr.drive.b= us, + disk->info.addr.drive.t= arget, + disk->info.addr.drive.u= nit); } } else { int idx =3D virDiskNameToIndex(disk->dst); - virAsprintf(&disk->info.alias, "%s-disk%d", prefix, idx); + disk->info.alias =3D g_strdup_printf("%s-disk%d", prefix, idx); } } =20 @@ -236,15 +236,15 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def, break; =20 case VIR_DOMAIN_DISK_BUS_VIRTIO: - virAsprintf(&diskPriv->qomName, - "/machine/peripheral/%s/virtio-backend", - disk->info.alias); + diskPriv->qomName =3D g_strdup_printf( + "/machine/peripheral/%s/vi= rtio-backend", + disk->info.alias); break; =20 case VIR_DOMAIN_DISK_BUS_USB: - virAsprintf(&diskPriv->qomName, - "/machine/peripheral/%s/%s.0/legacy[0]", - disk->info.alias, disk->info.alias); + diskPriv->qomName =3D g_strdup_printf( + "/machine/peripheral/%s/%s= .0/legacy[0]", + disk->info.alias, disk->in= fo.alias); break; =20 case VIR_DOMAIN_DISK_BUS_XEN: @@ -290,7 +290,7 @@ qemuAssignDeviceHostdevAlias(virDomainDefPtr def, } } =20 - virAsprintf(alias, "hostdev%d", idx); + *alias =3D g_strdup_printf("hostdev%d", idx); =20 return 0; } @@ -325,7 +325,7 @@ qemuAssignDeviceNetAlias(virDomainDefPtr def, } } =20 - virAsprintf(&net->info.alias, "net%d", idx); + net->info.alias =3D g_strdup_printf("net%d", idx); return 0; } =20 @@ -337,7 +337,7 @@ qemuAssignDeviceFSAlias(virDomainFSDefPtr fss, if (fss->info.alias) return 0; =20 - virAsprintf(&fss->info.alias, "fs%d", idx); + fss->info.alias =3D g_strdup_printf("fs%d", idx); return 0; } =20 @@ -349,7 +349,7 @@ qemuAssignDeviceSoundAlias(virDomainSoundDefPtr sound, if (sound->info.alias) return 0; =20 - virAsprintf(&sound->info.alias, "sound%d", idx); + sound->info.alias =3D g_strdup_printf("sound%d", idx); return 0; } =20 @@ -361,7 +361,7 @@ qemuAssignDeviceVideoAlias(virDomainVideoDefPtr video, if (video->info.alias) return 0; =20 - virAsprintf(&video->info.alias, "video%d", idx); + video->info.alias =3D g_strdup_printf("video%d", idx); return 0; } =20 @@ -373,7 +373,7 @@ qemuAssignDeviceHubAlias(virDomainHubDefPtr hub, if (hub->info.alias) return 0; =20 - virAsprintf(&hub->info.alias, "hub%d", idx); + hub->info.alias =3D g_strdup_printf("hub%d", idx); return 0; } =20 @@ -385,7 +385,7 @@ qemuAssignDeviceSmartcardAlias(virDomainSmartcardDefPtr= smartcard, if (smartcard->info.alias) return 0; =20 - virAsprintf(&smartcard->info.alias, "smartcard%d", idx); + smartcard->info.alias =3D g_strdup_printf("smartcard%d", idx); return 0; } =20 @@ -397,7 +397,7 @@ qemuAssingDeviceMemballoonAlias(virDomainMemballoonDefP= tr memballoon, if (memballoon->info.alias) return 0; =20 - virAsprintf(&memballoon->info.alias, "balloon%d", idx); + memballoon->info.alias =3D g_strdup_printf("balloon%d", idx); return 0; } =20 @@ -409,7 +409,7 @@ qemuAssignDeviceTPMAlias(virDomainTPMDefPtr tpm, if (tpm->info.alias) return 0; =20 - virAsprintf(&tpm->info.alias, "tpm%d", idx); + tpm->info.alias =3D g_strdup_printf("tpm%d", idx); return 0; } =20 @@ -434,7 +434,7 @@ qemuAssignDeviceRedirdevAlias(virDomainDefPtr def, } } =20 - virAsprintf(&redirdev->info.alias, "redir%d", idx); + redirdev->info.alias =3D g_strdup_printf("redir%d", idx); return 0; } =20 @@ -455,7 +455,7 @@ qemuAssignDeviceRNGAlias(virDomainDefPtr def, maxidx =3D idx + 1; } =20 - virAsprintf(&rng->info.alias, "rng%d", maxidx); + rng->info.alias =3D g_strdup_printf("rng%d", maxidx); =20 return 0; } @@ -500,7 +500,7 @@ qemuAssignDeviceMemoryAlias(virDomainDefPtr def, maxidx =3D mem->info.addr.dimm.slot; } =20 - virAsprintf(&mem->info.alias, "%s%d", prefix, maxidx); + mem->info.alias =3D g_strdup_printf("%s%d", prefix, maxidx); =20 return 0; } @@ -529,7 +529,7 @@ qemuAssignDeviceShmemAlias(virDomainDefPtr def, } } =20 - virAsprintf(&shmem->info.alias, "shmem%d", idx); + shmem->info.alias =3D g_strdup_printf("shmem%d", idx); return 0; } =20 @@ -565,7 +565,7 @@ qemuAssignDeviceInputAlias(virDomainDefPtr def, } } =20 - virAsprintf(&input->info.alias, "input%d", idx); + input->info.alias =3D g_strdup_printf("input%d", idx); =20 return 0; } @@ -705,7 +705,7 @@ qemuAliasDiskDriveFromDisk(const virDomainDiskDef *disk) return NULL; } =20 - virAsprintf(&ret, "%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias); + ret =3D g_strdup_printf("%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.ali= as); return ret; } =20 @@ -741,9 +741,9 @@ qemuAliasFromHostdev(const virDomainHostdevDef *hostdev) return NULL; } =20 - virAsprintf(&ret, "%s-%s", - virDomainDeviceAddressTypeToString(hostdev->info->type), - hostdev->info->alias); + ret =3D g_strdup_printf("%s-%s", + virDomainDeviceAddressTypeToString(hostdev->info= ->type), + hostdev->info->alias); return ret; } =20 @@ -786,9 +786,9 @@ qemuDomainGetSecretAESAlias(const char *srcalias, } =20 if (isLuks) - virAsprintf(&alias, "%s-luks-secret0", srcalias); + alias =3D g_strdup_printf("%s-luks-secret0", srcalias); else - virAsprintf(&alias, "%s-secret0", srcalias); + alias =3D g_strdup_printf("%s-secret0", srcalias); =20 return alias; } @@ -804,7 +804,7 @@ qemuAliasTLSObjFromSrcAlias(const char *srcAlias) { char *ret; =20 - virAsprintf(&ret, "obj%s_tls0", srcAlias); + ret =3D g_strdup_printf("obj%s_tls0", srcAlias); =20 return ret; } @@ -820,7 +820,7 @@ qemuAliasChardevFromDevAlias(const char *devAlias) { char *ret; =20 - virAsprintf(&ret, "char%s", devAlias); + ret =3D g_strdup_printf("char%s", devAlias); =20 return ret; } @@ -838,7 +838,7 @@ qemuDomainGetUnmanagedPRAlias(const char *parentalias) { char *ret; =20 - virAsprintf(&ret, "pr-helper-%s", parentalias); + ret =3D g_strdup_printf("pr-helper-%s", parentalias); =20 return ret; } @@ -849,7 +849,7 @@ qemuAliasDBusVMStateFromId(const char *id) char *ret; size_t i; =20 - virAsprintf(&ret, "dbus-vms-%s", id); + ret =3D g_strdup_printf("dbus-vms-%s", id); =20 for (i =3D 0; ret[i]; i++) { if (ret[i] =3D=3D ':') diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index f40915fe23..b8f0208742 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -423,17 +423,17 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) =20 uri->scheme =3D g_strdup(virStorageNetProtocolTypeToString(src->pr= otocol)); } else { - virAsprintf(&uri->scheme, "%s+%s", - virStorageNetProtocolTypeToString(src->protocol), - virStorageNetHostTransportTypeToString(src->hosts->tra= nsport)); + uri->scheme =3D g_strdup_printf("%s+%s", + virStorageNetProtocolTypeToString(sr= c->protocol), + virStorageNetHostTransportTypeToStri= ng(src->hosts->transport)); } =20 if (src->path) { if (src->volume) { - virAsprintf(&uri->path, "/%s/%s", src->volume, src->path); + uri->path =3D g_strdup_printf("/%s/%s", src->volume, src->path= ); } else { - virAsprintf(&uri->path, "%s%s", src->path[0] =3D=3D '/' ? "" := "/", - src->path); + uri->path =3D g_strdup_printf("%s%s", src->path[0] =3D=3D '/' = ? "" : "/", + src->path); } } =20 @@ -472,7 +472,7 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorage= NetHostDefPtr host, else transport =3D "inet"; =20 - virAsprintf(&port, "%u", host->port); + port =3D g_strdup_printf("%u", host->port); =20 if (virJSONValueObjectCreate(&server, "s:type", transport, @@ -564,7 +564,7 @@ qemuBlockStorageSourceBuildJSONInetSocketAddress(virSto= rageNetHostDefPtr host) return NULL; } =20 - virAsprintf(&port, "%u", host->port); + port =3D g_strdup_printf("%u", host->port); =20 ignore_value(virJSONValueObjectCreate(&ret, "s:host", host->name, @@ -760,10 +760,10 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourceP= tr src, =20 /* combine host and port into portal */ if (virSocketAddrNumericFamily(src->hosts[0].name) =3D=3D AF_INET6) { - virAsprintf(&portal, "[%s]:%u", src->hosts[0].name, - src->hosts[0].port); + portal =3D g_strdup_printf("[%s]:%u", src->hosts[0].name, + src->hosts[0].port); } else { - virAsprintf(&portal, "%s:%u", src->hosts[0].name, src->hosts[0].po= rt); + portal =3D g_strdup_printf("%s:%u", src->hosts[0].name, src->hosts= [0].port); } =20 if (!onlytarget && src->auth) { @@ -1955,7 +1955,7 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr sr= c) if (!(backingJSON =3D virJSONValueToString(backingProps, false))) return NULL; =20 - virAsprintf(&ret, "json:%s", backingJSON); + ret =3D g_strdup_printf("json:%s", backingJSON); =20 return ret; } @@ -2038,9 +2038,9 @@ qemuBlockStorageSourceCreateGetEncryptionLUKS(virStor= ageSourcePtr src, =20 if (src->encryption) { if (src->encryption->encinfo.cipher_name) { - virAsprintf(&cipheralg, "%s-%u", - src->encryption->encinfo.cipher_name, - src->encryption->encinfo.cipher_size); + cipheralg =3D g_strdup_printf("%s-%u", + src->encryption->encinfo.cipher_na= me, + src->encryption->encinfo.cipher_si= ze); } =20 if (virJSONValueObjectAdd(props, diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index e59cab3478..f8ee00711a 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -227,7 +227,7 @@ qemuBlockJobDiskNewPull(virDomainObjPtr vm, g_autofree char *jobname =3D NULL; =20 if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - virAsprintf(&jobname, "pull-%s-%s", disk->dst, disk->src->nodeform= at); + jobname =3D g_strdup_printf("pull-%s-%s", disk->dst, disk->src->no= deformat); } else { if (!(jobname =3D qemuAliasDiskDriveFromDisk(disk))) return NULL; @@ -261,7 +261,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm, jobtype =3D QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT; =20 if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - virAsprintf(&jobname, "commit-%s-%s", disk->dst, top->nodeformat); + jobname =3D g_strdup_printf("commit-%s-%s", disk->dst, top->nodefo= rmat); } else { if (!(jobname =3D qemuAliasDiskDriveFromDisk(disk))) return NULL; @@ -294,7 +294,7 @@ qemuBlockJobNewCreate(virDomainObjPtr vm, if (storage) nodename =3D src->nodestorage; =20 - virAsprintf(&jobname, "create-%s", nodename); + jobname =3D g_strdup_printf("create-%s", nodename); =20 if (!(job =3D qemuBlockJobDataNew(QEMU_BLOCKJOB_TYPE_CREATE, jobname))) return NULL; @@ -323,7 +323,7 @@ qemuBlockJobDiskNewCopy(virDomainObjPtr vm, g_autofree char *jobname =3D NULL; =20 if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - virAsprintf(&jobname, "copy-%s-%s", disk->dst, disk->src->nodeform= at); + jobname =3D g_strdup_printf("copy-%s-%s", disk->dst, disk->src->no= deformat); } else { if (!(jobname =3D qemuAliasDiskDriveFromDisk(disk))) return NULL; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b2ea7ec373..8c339e96ca 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -734,7 +734,7 @@ virQEMUCapsFindBinary(const char *format, char *ret =3D NULL; char *binary =3D NULL; =20 - virAsprintf(&binary, format, archstr); + binary =3D g_strdup_printf(format, archstr); =20 ret =3D virFindFileInPath(binary); VIR_FREE(binary); @@ -2411,7 +2411,7 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCa= ps, =20 /* The QOM type for machine types is the machine type name * followed by the -machine suffix */ - virAsprintf(&type, "%s-machine", canon); + type =3D g_strdup_printf("%s-machine", canon); =20 if ((nvalues =3D qemuMonitorGetObjectProps(mon, type, &values)) < = 0) return -1; @@ -4847,7 +4847,7 @@ virQEMUCapsCacheNew(const char *libDir, virQEMUCapsCachePrivPtr priv =3D NULL; struct utsname uts; =20 - virAsprintf(&capsCacheDir, "%s/capabilities", cacheDir); + capsCacheDir =3D g_strdup_printf("%s/capabilities", cacheDir); =20 if (!(cache =3D virFileCacheNew(capsCacheDir, "xml", &qemuCapsCacheHan= dlers))) goto error; @@ -4865,7 +4865,7 @@ virQEMUCapsCacheNew(const char *libDir, priv->kvmUsable =3D VIR_TRISTATE_BOOL_ABSENT; =20 if (uname(&uts) =3D=3D 0) - virAsprintf(&priv->kernelVersion, "%s %s", uts.release, uts.versio= n); + priv->kernelVersion =3D g_strdup_printf("%s %s", uts.release, uts.= version); =20 cleanup: VIR_FREE(capsCacheDir); diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 4c224d6f40..e693e1ab14 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -92,14 +92,14 @@ qemuCheckpointWriteMetadata(virDomainObjPtr vm, if (newxml =3D=3D NULL) return -1; =20 - virAsprintf(&chkDir, "%s/%s", checkpointDir, vm->def->name); + chkDir =3D g_strdup_printf("%s/%s", checkpointDir, vm->def->name); if (virFileMakePath(chkDir) < 0) { virReportSystemError(errno, _("cannot create checkpoint directory = '%s'"), chkDir); return -1; } =20 - virAsprintf(&chkFile, "%s/%s.xml", chkDir, def->parent.name); + chkFile =3D g_strdup_printf("%s/%s.xml", chkDir, def->parent.name); =20 return virXMLSaveFile(chkFile, NULL, "checkpoint-edit", newxml); } @@ -125,8 +125,8 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver, return -1; } =20 - virAsprintf(&chkFile, "%s/%s/%s.xml", cfg->checkpointDir, vm->def->nam= e, - chk->def->name); + chkFile =3D g_strdup_printf("%s/%s/%s.xml", cfg->checkpointDir, vm->de= f->name, + chk->def->name); =20 if (!metadata_only) { qemuDomainObjPrivatePtr priv =3D vm->privateData; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a55a5826a7..e234be298d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -262,7 +262,7 @@ qemuVirCommandGetFDSet(virCommandPtr cmd, int fd) return NULL; } =20 - virAsprintf(&result, "set=3D%d,fd=3D%d", idx, fd); + result =3D g_strdup_printf("set=3D%d,fd=3D%d", idx, fd); return result; } =20 @@ -289,7 +289,7 @@ qemuVirCommandGetDevSet(virCommandPtr cmd, int fd) return NULL; } =20 - virAsprintf(&result, "/dev/fdset/%d", idx); + result =3D g_strdup_printf("/dev/fdset/%d", idx); return result; } =20 @@ -795,8 +795,8 @@ qemuBuildGeneralSecinfoURI(virURIPtr uri, _("found non printable characters in secret= ")); return -1; } - virAsprintf(&uri->user, "%s:%s", secinfo->s.plain.username, - secinfo->s.plain.secret); + uri->user =3D g_strdup_printf("%s:%s", secinfo->s.plain.userna= me, + secinfo->s.plain.secret); } else { uri->user =3D g_strdup(secinfo->s.plain.username); } @@ -946,7 +946,7 @@ qemuBuildNetworkDriveURI(virStorageSourcePtr src, return NULL; =20 if (src->hosts->socket) - virAsprintf(&uri->query, "socket=3D%s", src->hosts->socket); + uri->query =3D g_strdup_printf("socket=3D%s", src->hosts->socket); =20 if (qemuBuildGeneralSecinfoURI(uri, secinfo) < 0) return NULL; @@ -1035,10 +1035,10 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, } =20 if (src->nhosts =3D=3D 0) { - virAsprintf(&ret, "sheepdog:%s", src->path); + ret =3D g_strdup_printf("sheepdog:%s", src->path); } else if (src->nhosts =3D=3D 1) { - virAsprintf(&ret, "sheepdog:%s:%u:%s", src->hosts->name, - src->hosts->port, src->path); + ret =3D g_strdup_printf("sheepdog:%s:%u:%s", src->hosts->n= ame, + src->hosts->port, src->path); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("protocol 'sheepdog' accepts up to one ho= st")); @@ -2370,7 +2370,7 @@ qemuBuildFloppyCommandLineControllerOptions(virComman= dPtr cmd, driveLetter =3D 'A'; =20 if (bootindex) - virAsprintf(&bootindexStr, "bootindex%c=3D%u", driveLetter, bo= otindex); + bootindexStr =3D g_strdup_printf("bootindex%c=3D%u", driveLett= er, bootindex); =20 /* with -blockdev we setup the floppy device and it's backend with= -device */ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) { @@ -2378,7 +2378,7 @@ qemuBuildFloppyCommandLineControllerOptions(virComman= dPtr cmd, return -1; =20 if (backendAlias) - virAsprintf(&backendStr, "drive%c=3D%s", driveLetter, back= endAlias); + backendStr =3D g_strdup_printf("drive%c=3D%s", driveLetter= , backendAlias); } =20 if (!explicitfdc) { @@ -3580,7 +3580,7 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, unsigned long long memsize =3D virDomainNumaGetNodeMemorySize(def->num= a, cell); =20 - virAsprintf(&alias, "ram-node%zu", cell); + alias =3D g_strdup_printf("ram-node%zu", cell); =20 mem.size =3D memsize; mem.targetNode =3D cell; @@ -3613,7 +3613,7 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf, return -1; } =20 - virAsprintf(&alias, "mem%s", mem->info.alias); + alias =3D g_strdup_printf("mem%s", mem->info.alias); =20 if (qemuBuildMemoryBackendProps(&props, alias, cfg, priv, def, mem, true) < 0) @@ -3697,14 +3697,14 @@ qemuBuildLegacyNicStr(virDomainNetDefPtr net) char macaddr[VIR_MAC_STRING_BUFLEN]; const char *netmodel =3D virDomainNetGetModelString(net); =20 - virAsprintf(&str, - "nic,macaddr=3D%s,netdev=3Dhost%s%s%s%s%s", - virMacAddrFormat(&net->mac, macaddr), - net->info.alias, - netmodel ? ",model=3D" : "", - NULLSTR_EMPTY(netmodel), - (net->info.alias ? ",id=3D" : ""), - NULLSTR_EMPTY(net->info.alias)); + str =3D g_strdup_printf( + "nic,macaddr=3D%s,netdev=3Dhost%s%s%s%s%s", + virMacAddrFormat(&net->mac, macaddr), + net->info.alias, + netmodel ? ",model=3D" : "", + NULLSTR_EMPTY(netmodel), + (net->info.alias ? ",id=3D" : ""), + NULLSTR_EMPTY(net->info.alias)); return str; } =20 @@ -4698,7 +4698,7 @@ qemuBuildVhostUserChardevStr(const char *alias, return NULL; } =20 - virAsprintf(&chardev, "socket,id=3Dchr-vu-%s,fd=3D%d", alias, *fd); + chardev =3D g_strdup_printf("socket,id=3Dchr-vu-%s,fd=3D%d", alias, *f= d); =20 virCommandPassFD(cmd, *fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); *fd =3D -1; @@ -5543,7 +5543,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, if (virSCSIVHostOpenVhostSCSI(&vhostfd) < 0) return -1; =20 - virAsprintf(&vhostfdName, "%d", vhostfd); + vhostfdName =3D g_strdup_printf("%d", vhostfd); =20 virCommandPassFD(cmd, vhostfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); @@ -5777,7 +5777,7 @@ qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, g_autofree char *objAlias =3D NULL; g_autofree char *charBackendAlias =3D NULL; =20 - virAsprintf(&objAlias, "obj%s", rng->info.alias); + objAlias =3D g_strdup_printf("obj%s", rng->info.alias); =20 switch ((virDomainRNGBackend) rng->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: @@ -8566,7 +8566,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, int slirpfd =3D qemuSlirpGetFD(slirp); virCommandPassFD(cmd, slirpfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); - virAsprintf(&slirpfdName, "%d", slirpfd); + slirpfdName =3D g_strdup_printf("%d", slirpfd); } =20 =20 @@ -8574,14 +8574,14 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driv= er, if (qemuSecuritySetTapFDLabel(driver->securityManager, def, tapfd[i]) < 0) goto cleanup; - virAsprintf(&tapfdName[i], "%d", tapfd[i]); + tapfdName[i] =3D g_strdup_printf("%d", tapfd[i]); virCommandPassFD(cmd, tapfd[i], VIR_COMMAND_PASS_FD_CLOSE_PARENT); tapfd[i] =3D -1; } =20 for (i =3D 0; i < vhostfdSize; i++) { - virAsprintf(&vhostfdName[i], "%d", vhostfd[i]); + vhostfdName[i] =3D g_strdup_printf("%d", vhostfd[i]); virCommandPassFD(cmd, vhostfd[i], VIR_COMMAND_PASS_FD_CLOSE_PARENT); vhostfd[i] =3D -1; @@ -8957,9 +8957,9 @@ qemuBuildShmemBackendMemProps(virDomainShmemDefPtr sh= mem) g_autofree char *mem_path =3D NULL; virJSONValuePtr ret =3D NULL; =20 - virAsprintf(&mem_path, "/dev/shm/%s", shmem->name); + mem_path =3D g_strdup_printf("/dev/shm/%s", shmem->name); =20 - virAsprintf(&mem_alias, "shmmem-%s", shmem->info.alias); + mem_alias =3D g_strdup_printf("shmmem-%s", shmem->info.alias); =20 qemuMonitorCreateObjectProps(&ret, "memory-backend-file", mem_alias, "s:mem-path", mem_path, @@ -9689,8 +9689,8 @@ qemuBuildTPMBackendStr(const virDomainDef *def, case VIR_DOMAIN_TPM_TYPE_EMULATOR: virBufferAddLit(&buf, ",chardev=3Dchrtpm"); =20 - virAsprintf(chardev, "socket,id=3Dchrtpm,path=3D%s", - tpm->data.emulator.source.data.nix.path); + *chardev =3D g_strdup_printf("socket,id=3Dchrtpm,path=3D%s", + tpm->data.emulator.source.data.nix.path); =20 break; case VIR_DOMAIN_TPM_TYPE_LAST: @@ -9775,13 +9775,13 @@ qemuBuildSEVCommandLine(virDomainObjPtr vm, virComm= andPtr cmd, virBufferAsprintf(&buf, ",policy=3D0x%x", sev->policy); =20 if (sev->dh_cert) { - virAsprintf(&path, "%s/dh_cert.base64", priv->libDir); + path =3D g_strdup_printf("%s/dh_cert.base64", priv->libDir); virBufferAsprintf(&buf, ",dh-cert-file=3D%s", path); VIR_FREE(path); } =20 if (sev->session) { - virAsprintf(&path, "%s/session.base64", priv->libDir); + path =3D g_strdup_printf("%s/session.base64", priv->libDir); virBufferAsprintf(&buf, ",session-file=3D%s", path); VIR_FREE(path); } @@ -10578,8 +10578,8 @@ static int qemuBuildParallelChrDeviceStr(char **deviceStr, virDomainChrDefPtr chr) { - virAsprintf(deviceStr, "isa-parallel,chardev=3Dchar%s,id=3D%s", - chr->info.alias, chr->info.alias); + *deviceStr =3D g_strdup_printf("isa-parallel,chardev=3Dchar%s,id=3D%s", + chr->info.alias, chr->info.alias); return 0; } =20 @@ -10600,8 +10600,8 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, return ret; port =3D virSocketAddrGetPort(chr->target.addr); =20 - virAsprintf(deviceStr, "user,guestfwd=3Dtcp:%s:%i-chardev:char%s,i= d=3D%s", - addr, port, chr->info.alias, chr->info.alias); + *deviceStr =3D g_strdup_printf("user,guestfwd=3Dtcp:%s:%i-chardev:= char%s,id=3D%s", + addr, port, chr->info.alias, chr->inf= o.alias); break; =20 case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 41fd134afc..19f4b00710 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -130,29 +130,29 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool pr= ivileged) cfg->cgroupControllers =3D -1; /* -1 =3D=3D auto-detect */ =20 if (privileged) { - virAsprintf(&cfg->logDir, "%s/log/libvirt/qemu", LOCALSTATEDIR); + cfg->logDir =3D g_strdup_printf("%s/log/libvirt/qemu", LOCALSTATED= IR); =20 - virAsprintf(&cfg->swtpmLogDir, "%s/log/swtpm/libvirt/qemu", - LOCALSTATEDIR); + cfg->swtpmLogDir =3D g_strdup_printf("%s/log/swtpm/libvirt/qemu", + LOCALSTATEDIR); =20 cfg->configBaseDir =3D g_strdup(SYSCONFDIR "/libvirt"); =20 - virAsprintf(&cfg->stateDir, "%s/libvirt/qemu", RUNSTATEDIR); + cfg->stateDir =3D g_strdup_printf("%s/libvirt/qemu", RUNSTATEDIR); =20 - virAsprintf(&cfg->swtpmStateDir, "%s/libvirt/qemu/swtpm", RUNSTATE= DIR); + cfg->swtpmStateDir =3D g_strdup_printf("%s/libvirt/qemu/swtpm", RU= NSTATEDIR); =20 - virAsprintf(&cfg->cacheDir, "%s/cache/libvirt/qemu", LOCALSTATEDIR= ); + cfg->cacheDir =3D g_strdup_printf("%s/cache/libvirt/qemu", LOCALST= ATEDIR); =20 - virAsprintf(&cfg->libDir, "%s/lib/libvirt/qemu", LOCALSTATEDIR); - virAsprintf(&cfg->saveDir, "%s/save", cfg->libDir); - virAsprintf(&cfg->snapshotDir, "%s/snapshot", cfg->libDir); - virAsprintf(&cfg->checkpointDir, "%s/checkpoint", cfg->libDir); - virAsprintf(&cfg->autoDumpPath, "%s/dump", cfg->libDir); - virAsprintf(&cfg->channelTargetDir, "%s/channel/target", cfg->libD= ir); - virAsprintf(&cfg->nvramDir, "%s/nvram", cfg->libDir); - virAsprintf(&cfg->memoryBackingDir, "%s/ram", cfg->libDir); - virAsprintf(&cfg->swtpmStorageDir, "%s/lib/libvirt/swtpm", - LOCALSTATEDIR); + cfg->libDir =3D g_strdup_printf("%s/lib/libvirt/qemu", LOCALSTATED= IR); + cfg->saveDir =3D g_strdup_printf("%s/save", cfg->libDir); + cfg->snapshotDir =3D g_strdup_printf("%s/snapshot", cfg->libDir); + cfg->checkpointDir =3D g_strdup_printf("%s/checkpoint", cfg->libDi= r); + cfg->autoDumpPath =3D g_strdup_printf("%s/dump", cfg->libDir); + cfg->channelTargetDir =3D g_strdup_printf("%s/channel/target", cfg= ->libDir); + cfg->nvramDir =3D g_strdup_printf("%s/nvram", cfg->libDir); + cfg->memoryBackingDir =3D g_strdup_printf("%s/ram", cfg->libDir); + cfg->swtpmStorageDir =3D g_strdup_printf("%s/lib/libvirt/swtpm", + LOCALSTATEDIR); if (!virDoesUserExist("tss") || virGetUserID("tss", &cfg->swtpm_user) < 0) cfg->swtpm_user =3D 0; /* fall back to root */ @@ -167,39 +167,39 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool pr= ivileged) if (!cachedir) return NULL; =20 - virAsprintf(&cfg->logDir, "%s/qemu/log", cachedir); - virAsprintf(&cfg->swtpmLogDir, "%s/qemu/log", cachedir); - virAsprintf(&cfg->cacheDir, "%s/qemu/cache", cachedir); + cfg->logDir =3D g_strdup_printf("%s/qemu/log", cachedir); + cfg->swtpmLogDir =3D g_strdup_printf("%s/qemu/log", cachedir); + cfg->cacheDir =3D g_strdup_printf("%s/qemu/cache", cachedir); =20 rundir =3D virGetUserRuntimeDirectory(); if (!rundir) return NULL; - virAsprintf(&cfg->stateDir, "%s/qemu/run", rundir); + cfg->stateDir =3D g_strdup_printf("%s/qemu/run", rundir); =20 - virAsprintf(&cfg->swtpmStateDir, "%s/swtpm", cfg->stateDir); + cfg->swtpmStateDir =3D g_strdup_printf("%s/swtpm", cfg->stateDir); =20 if (!(cfg->configBaseDir =3D virGetUserConfigDirectory())) return NULL; =20 - virAsprintf(&cfg->libDir, "%s/qemu/lib", cfg->configBaseDir); - virAsprintf(&cfg->saveDir, "%s/qemu/save", cfg->configBaseDir); - virAsprintf(&cfg->snapshotDir, "%s/qemu/snapshot", cfg->configBase= Dir); - virAsprintf(&cfg->checkpointDir, "%s/qemu/checkpoint", - cfg->configBaseDir); - virAsprintf(&cfg->autoDumpPath, "%s/qemu/dump", cfg->configBaseDir= ); - virAsprintf(&cfg->channelTargetDir, "%s/qemu/channel/target", - cfg->configBaseDir); - virAsprintf(&cfg->nvramDir, "%s/qemu/nvram", cfg->configBaseDir); - virAsprintf(&cfg->memoryBackingDir, "%s/qemu/ram", cfg->configBase= Dir); - virAsprintf(&cfg->swtpmStorageDir, "%s/qemu/swtpm", - cfg->configBaseDir); + cfg->libDir =3D g_strdup_printf("%s/qemu/lib", cfg->configBaseDir); + cfg->saveDir =3D g_strdup_printf("%s/qemu/save", cfg->configBaseDi= r); + cfg->snapshotDir =3D g_strdup_printf("%s/qemu/snapshot", cfg->conf= igBaseDir); + cfg->checkpointDir =3D g_strdup_printf("%s/qemu/checkpoint", + cfg->configBaseDir); + cfg->autoDumpPath =3D g_strdup_printf("%s/qemu/dump", cfg->configB= aseDir); + cfg->channelTargetDir =3D g_strdup_printf("%s/qemu/channel/target", + cfg->configBaseDir); + cfg->nvramDir =3D g_strdup_printf("%s/qemu/nvram", cfg->configBase= Dir); + cfg->memoryBackingDir =3D g_strdup_printf("%s/qemu/ram", cfg->conf= igBaseDir); + cfg->swtpmStorageDir =3D g_strdup_printf("%s/qemu/swtpm", + cfg->configBaseDir); cfg->swtpm_user =3D (uid_t)-1; cfg->swtpm_group =3D (gid_t)-1; } =20 - virAsprintf(&cfg->configDir, "%s/qemu", cfg->configBaseDir); - virAsprintf(&cfg->autostartDir, "%s/qemu/autostart", cfg->configBaseDi= r); - virAsprintf(&cfg->slirpStateDir, "%s/slirp", cfg->stateDir); + cfg->configDir =3D g_strdup_printf("%s/qemu", cfg->configBaseDir); + cfg->autostartDir =3D g_strdup_printf("%s/qemu/autostart", cfg->config= BaseDir); + cfg->slirpStateDir =3D g_strdup_printf("%s/slirp", cfg->stateDir); =20 /* Set the default directory to find TLS X.509 certificates. * This will then be used as a fallback if the service specific @@ -1354,8 +1354,8 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriverPtr d= river, cfg->firmwares, cfg->nfirmwares) < 0) return NULL; =20 - virAsprintf(&key, "%d:%d:%s:%s", data.arch, data.virttype, - NULLSTR(data.machine), NULLSTR(data.path)); + key =3D g_strdup_printf("%d:%d:%s:%s", data.arch, data.virttype, + NULLSTR(data.machine), NULLSTR(data.path)); =20 if (virHashAddEntry(domCapsCache, key, domCaps) < 0) return NULL; @@ -1386,7 +1386,7 @@ qemuGetSharedDeviceKey(const char *device_path) return NULL; } =20 - virAsprintf(&key, "%d:%d", maj, min); + key =3D g_strdup_printf("%d:%d", maj, min); =20 return key; } @@ -1662,7 +1662,7 @@ qemuGetHostdevPath(virDomainHostdevDefPtr hostdev) scsihostsrc->unit))) return NULL; =20 - virAsprintf(&dev_path, "/dev/%s", dev_name); + dev_path =3D g_strdup_printf("/dev/%s", dev_name); return dev_path; } =20 @@ -1839,7 +1839,7 @@ qemuGetBaseHugepagePath(virHugeTLBFSPtr hugepage) { char *ret; =20 - virAsprintf(&ret, "%s/libvirt/qemu", hugepage->mnt_dir); + ret =3D g_strdup_printf("%s/libvirt/qemu", hugepage->mnt_dir); =20 return ret; } @@ -1854,7 +1854,7 @@ qemuGetDomainHugepagePath(const virDomainDef *def, char *ret =3D NULL; =20 if (base && domPath) - virAsprintf(&ret, "%s/%s", base, domPath); + ret =3D g_strdup_printf("%s/%s", base, domPath); return ret; } =20 @@ -1906,7 +1906,7 @@ void qemuGetMemoryBackingBasePath(virQEMUDriverConfigPtr cfg, char **path) { - virAsprintf(path, "%s/libvirt/qemu", cfg->memoryBackingDir); + *path =3D g_strdup_printf("%s/libvirt/qemu", cfg->memoryBackingDir); } =20 =20 @@ -1922,7 +1922,7 @@ qemuGetMemoryBackingDomainPath(const virDomainDef *de= f, return -1; =20 qemuGetMemoryBackingBasePath(cfg, &base); - virAsprintf(path, "%s/%s", base, shortName); + *path =3D g_strdup_printf("%s/%s", base, shortName); =20 return 0; } @@ -1958,6 +1958,6 @@ qemuGetMemoryBackingPath(const virDomainDef *def, if (qemuGetMemoryBackingDomainPath(def, cfg, &domainPath) < 0) return -1; =20 - virAsprintf(memPath, "%s/%s", domainPath, alias); + *memPath =3D g_strdup_printf("%s/%s", domainPath, alias); return 0; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 25d4a0eb07..fe97e13c4f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2025,11 +2025,11 @@ qemuDomainSetPrivatePathsOld(virQEMUDriverPtr drive= r, virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); =20 if (!priv->libDir) - virAsprintf(&priv->libDir, "%s/domain-%s", cfg->libDir, vm->def->n= ame); + priv->libDir =3D g_strdup_printf("%s/domain-%s", cfg->libDir, vm->= def->name); =20 if (!priv->channelTargetDir) - virAsprintf(&priv->channelTargetDir, "%s/domain-%s", - cfg->channelTargetDir, vm->def->name); + priv->channelTargetDir =3D g_strdup_printf("%s/domain-%s", + cfg->channelTargetDir, vm= ->def->name); =20 virObjectUnref(cfg); } @@ -2048,11 +2048,11 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, goto cleanup; =20 if (!priv->libDir) - virAsprintf(&priv->libDir, "%s/domain-%s", cfg->libDir, domname); + priv->libDir =3D g_strdup_printf("%s/domain-%s", cfg->libDir, domn= ame); =20 if (!priv->channelTargetDir) - virAsprintf(&priv->channelTargetDir, "%s/domain-%s", - cfg->channelTargetDir, domname); + priv->channelTargetDir =3D g_strdup_printf("%s/domain-%s", + cfg->channelTargetDir, do= mname); =20 ret =3D 0; cleanup: @@ -9316,7 +9316,7 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(virQE= MUDriverPtr driver, ctxt->writefd =3D -1; ctxt->readfd =3D -1; =20 - virAsprintf(&ctxt->path, "%s/%s.log", cfg->logDir, vm->def->name); + ctxt->path =3D g_strdup_printf("%s/%s.log", cfg->logDir, vm->def->name= ); =20 if (cfg->stdioLogD) { ctxt->manager =3D virLogManagerNew(virQEMUDriverIsPrivileged(drive= r)); @@ -9496,7 +9496,7 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver, VIR_DEBUG("Append log message (vm=3D'%s' message=3D'%s) stdioLogD=3D%d= ", vm->def->name, message, cfg->stdioLogD); =20 - virAsprintf(&path, "%s/%s.log", cfg->logDir, vm->def->name); + path =3D g_strdup_printf("%s/%s.log", cfg->logDir, vm->def->name); =20 if (cfg->stdioLogD) { if (!(manager =3D virLogManagerNew(virQEMUDriverIsPrivileged(drive= r)))) @@ -9589,14 +9589,14 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, if (newxml =3D=3D NULL) return -1; =20 - virAsprintf(&snapDir, "%s/%s", snapshotDir, vm->def->name); + snapDir =3D g_strdup_printf("%s/%s", snapshotDir, vm->def->name); if (virFileMakePath(snapDir) < 0) { virReportSystemError(errno, _("cannot create snapshot directory '%= s'"), snapDir); goto cleanup; } =20 - virAsprintf(&snapFile, "%s/%s.xml", snapDir, def->parent.name); + snapFile =3D g_strdup_printf("%s/%s.xml", snapDir, def->parent.name); =20 ret =3D virXMLSaveFile(snapFile, NULL, "snapshot-edit", newxml); =20 @@ -9729,8 +9729,8 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, } } =20 - virAsprintf(&snapFile, "%s/%s/%s.xml", cfg->snapshotDir, vm->def->name, - snap->def->name); + snapFile =3D g_strdup_printf("%s/%s/%s.xml", cfg->snapshotDir, vm->def= ->name, + snap->def->name); =20 if (snap =3D=3D virDomainSnapshotGetCurrent(vm->snapshots)) { virDomainSnapshotSetCurrent(vm->snapshots, NULL); @@ -9818,7 +9818,7 @@ qemuDomainRemoveInactiveCommon(virQEMUDriverPtr drive= r, VIR_WARN("unable to remove all snapshots for domain %s", vm->def->name); } else { - virAsprintf(&snapDir, "%s/%s", cfg->snapshotDir, vm->def->name); + snapDir =3D g_strdup_printf("%s/%s", cfg->snapshotDir, vm->def->na= me); =20 if (rmdir(snapDir) < 0 && errno !=3D ENOENT) VIR_WARN("unable to remove snapshot directory %s", snapDir); @@ -9828,8 +9828,8 @@ qemuDomainRemoveInactiveCommon(virQEMUDriverPtr drive= r, VIR_WARN("unable to remove all checkpoints for domain %s", vm->def->name); } else { - virAsprintf(&chkDir, "%s/%s", cfg->checkpointDir, - vm->def->name); + chkDir =3D g_strdup_printf("%s/%s", cfg->checkpointDir, + vm->def->name); if (rmdir(chkDir) < 0 && errno !=3D ENOENT) VIR_WARN("unable to remove checkpoint directory %s", chkDir); } @@ -10177,7 +10177,7 @@ qemuDomainStorageAlias(const char *device, int dept= h) if (!depth) alias =3D g_strdup(device); else - virAsprintf(&alias, "%s.%d", device, depth); + alias =3D g_strdup_printf("%s.%d", device, depth); return alias; } =20 @@ -11726,8 +11726,8 @@ ppc64VFIODeviceIsNV2Bridge(const char *device) for (i =3D 0; i < G_N_ELEMENTS(nvlink2Files); i++) { g_autofree char *file =3D NULL; =20 - virAsprintf(&file, "/sys/bus/pci/devices/%s/of_node/%s", - device, nvlink2Files[i]); + file =3D g_strdup_printf("/sys/bus/pci/devices/%s/of_node/%s", + device, nvlink2Files[i]); =20 if (!virFileExists(file)) return false; @@ -12406,15 +12406,15 @@ qemuDomainPrepareChannel(virDomainChrDefPtr chann= el, return 0; =20 if (channel->target.name) { - virAsprintf(&channel->source->data.nix.path, "%s/%s", - domainChannelTargetDir, channel->target.name); + channel->source->data.nix.path =3D g_strdup_printf("%s/%s", + domainChannelTarg= etDir, channel->target.name); } else { /* Generate a unique name */ - virAsprintf(&channel->source->data.nix.path, - "%s/vioser-%02d-%02d-%02d.sock", domainChannelTargetDi= r, - channel->info.addr.vioserial.controller, - channel->info.addr.vioserial.bus, - channel->info.addr.vioserial.port); + channel->source->data.nix.path =3D g_strdup_printf( + "%s/vioser-%02d-%= 02d-%02d.sock", domainChannelTargetDir, + channel->info.add= r.vioserial.controller, + channel->info.add= r.vioserial.bus, + channel->info.add= r.vioserial.port); } =20 return 0; @@ -12604,9 +12604,9 @@ qemuDomainPrepareShmemChardev(virDomainShmemDefPtr = shmem) shmem->server.chr.data.nix.path) return; =20 - virAsprintf(&shmem->server.chr.data.nix.path, - "/var/lib/libvirt/shmem-%s-sock", - shmem->name); + shmem->server.chr.data.nix.path =3D g_strdup_printf( + "/var/lib/libvirt/sh= mem-%s-sock", + shmem->name); } =20 =20 @@ -12932,7 +12932,7 @@ qemuDomainGetPreservedMountPath(virQEMUDriverConfig= Ptr cfg, if (STREQ(mountpoint, "/dev")) suffix =3D "dev"; =20 - virAsprintf(&path, "%s/%s.%s", cfg->stateDir, domname, suffix); + path =3D g_strdup_printf("%s/%s.%s", cfg->stateDir, domname, suffix); =20 /* Now consider that @mountpoint is "/dev/blah/blah2". * @suffix then points to "blah/blah2". However, caller @@ -13112,8 +13112,8 @@ qemuDomainCreateDeviceRecursive(const char *device, if (i =3D=3D data->ndevMountsPath) { /* Okay, @device is in /dev but not in any mount point under /= dev. * Create it. */ - virAsprintf(&devicePath, "%s/%s", data->path, - device + strlen(QEMU_DEVPREFIX)); + devicePath =3D g_strdup_printf("%s/%s", data->path, + device + strlen(QEMU_DEVPREFIX)); =20 if (virFileMakeParentPath(devicePath) < 0) { virReportSystemError(errno, @@ -13167,7 +13167,7 @@ qemuDomainCreateDeviceRecursive(const char *device, if ((c =3D strrchr(devTmp, '/'))) *(c + 1) =3D '\0'; =20 - virAsprintf(&tmp, "%s%s", devTmp, target); + tmp =3D g_strdup_printf("%s%s", devTmp, target); VIR_FREE(devTmp); VIR_FREE(target); target =3D g_steal_pointer(&tmp); @@ -13330,7 +13330,7 @@ qemuDomainSetupDev(virQEMUDriverConfigPtr cfg, * tmpfs is limited to 64kb, since we only have device nodes in there * and don't want to DOS the entire OS RAM usage */ - virAsprintf(&opts, "mode=3D755,size=3D65536%s", mount_options); + opts =3D g_strdup_printf("mode=3D755,size=3D65536%s", mount_options); =20 if (virFileSetupDev(data->path, opts) < 0) goto cleanup; @@ -14139,7 +14139,7 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverP= tr driver, if ((c =3D strrchr(fileTmp, '/'))) *(c + 1) =3D '\0'; =20 - virAsprintf(&tmp, "%s%s", fileTmp, target); + tmp =3D g_strdup_printf("%s%s", fileTmp, target); VIR_FREE(fileTmp); VIR_FREE(target); target =3D g_steal_pointer(&tmp); @@ -14695,7 +14695,7 @@ qemuDomainDiskBackingStoreGetName(virDomainDiskDefP= tr disk, char *ret =3D NULL; =20 if (idx) - virAsprintf(&ret, "%s[%d]", disk->dst, idx); + ret =3D g_strdup_printf("%s[%d]", disk->dst, idx); else ret =3D g_strdup(disk->dst); =20 @@ -15138,8 +15138,8 @@ qemuDomainPrepareStorageSourceBlockdev(virDomainDis= kDefPtr disk, { src->id =3D qemuDomainStorageIdNew(priv); =20 - virAsprintf(&src->nodestorage, "libvirt-%u-storage", src->id); - virAsprintf(&src->nodeformat, "libvirt-%u-format", src->id); + src->nodestorage =3D g_strdup_printf("libvirt-%u-storage", src->id); + src->nodeformat =3D g_strdup_printf("libvirt-%u-format", src->id); =20 if (qemuDomainValidateStorageSource(src, priv->qemuCaps) < 0) return -1; @@ -15173,7 +15173,7 @@ qemuDomainPrepareDiskSourceBlockdev(virDomainDiskDe= fPtr disk, =20 if (disk->copy_on_read =3D=3D VIR_TRISTATE_SWITCH_ON && !diskPriv->nodeCopyOnRead) - virAsprintf(&diskPriv->nodeCopyOnRead, "libvirt-CoR-%s", disk->dst= ); + diskPriv->nodeCopyOnRead =3D g_strdup_printf("libvirt-CoR-%s", dis= k->dst); =20 for (n =3D disk->src; virStorageSourceIsBacking(n); n =3D n->backingSt= ore) { if (qemuDomainPrepareStorageSourceBlockdev(disk, n, priv, cfg) < 0) @@ -15326,7 +15326,7 @@ qemuDomainGetManagedPRSocketPath(qemuDomainObjPriva= tePtr priv) { char *ret =3D NULL; =20 - virAsprintf(&ret, "%s/%s.sock", priv->libDir, qemuDomainGetManagedPRAl= ias()); + ret =3D g_strdup_printf("%s/%s.sock", priv->libDir, qemuDomainGetManag= edPRAlias()); =20 return ret; } @@ -15418,7 +15418,7 @@ qemuDomainNVRAMPathFormat(virQEMUDriverConfigPtr cf= g, virDomainDefPtr def, char **path) { - virAsprintf(path, "%s/%s_VARS.fd", cfg->nvramDir, def->name); + *path =3D g_strdup_printf("%s/%s_VARS.fd", cfg->nvramDir, def->name); } =20 =20 diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1bf0c63eb1..708e1041a3 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -154,7 +154,7 @@ qemuDomainDetachZPCIDevice(qemuMonitorPtr mon, { g_autofree char *zpciAlias =3D NULL; =20 - virAsprintf(&zpciAlias, "zpci%d", info->addr.pci.zpci.uid); + zpciAlias =3D g_strdup_printf("zpci%d", info->addr.pci.zpci.uid); =20 if (qemuMonitorDelDevice(mon, zpciAlias) < 0) return -1; @@ -1307,7 +1307,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, } =20 slirpfd =3D qemuSlirpGetFD(slirp); - virAsprintf(&slirpfdName, "slirpfd-%s", net->info.alias); + slirpfdName =3D g_strdup_printf("slirpfd-%s", net->info.alias); } break; =20 @@ -1356,10 +1356,10 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, goto cleanup; =20 for (i =3D 0; i < tapfdSize; i++) - virAsprintf(&tapfdName[i], "fd-%s%zu", net->info.alias, i); + tapfdName[i] =3D g_strdup_printf("fd-%s%zu", net->info.alias, i); =20 for (i =3D 0; i < vhostfdSize; i++) - virAsprintf(&vhostfdName[i], "vhostfd-%s%zu", net->info.alias, i); + vhostfdName[i] =3D g_strdup_printf("vhostfd-%s%zu", net->info.alia= s, i); =20 if (!(netstr =3D qemuBuildHostNetStr(net, tapfdName, tapfdSize, @@ -1502,7 +1502,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, goto cleanup; =20 virErrorPreserveLast(&originalError); - virAsprintf(&netdev_name, "host%s", net->info.alias); + netdev_name =3D g_strdup_printf("host%s", net->info.alias); if (QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp) qemuSlirpStop(QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp, vm, driver,= net, true); qemuDomainObjEnterMonitor(driver, vm); @@ -2353,7 +2353,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, if (qemuAssignDeviceMemoryAlias(vm->def, mem, priv->memAliasOrderMisma= tch) < 0) goto cleanup; =20 - virAsprintf(&objalias, "mem%s", mem->info.alias); + objalias =3D g_strdup_printf("mem%s", mem->info.alias); =20 if (!(devstr =3D qemuBuildMemoryDeviceStr(mem, priv))) goto cleanup; @@ -2699,7 +2699,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driv= er, if (virSCSIVHostOpenVhostSCSI(&vhostfd) < 0) goto cleanup; =20 - virAsprintf(&vhostfdName, "vhostfd-%d", vhostfd); + vhostfdName =3D g_strdup_printf("vhostfd-%d", vhostfd); =20 if (hostdev->info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { if (qemuDomainIsS390CCW(vm->def) && @@ -2970,7 +2970,7 @@ qemuDomainAttachShmemDevice(virQEMUDriverPtr driver, goto cleanup; =20 if (shmem->server.enabled) { - virAsprintf(&charAlias, "char%s", shmem->info.alias); + charAlias =3D g_strdup_printf("char%s", shmem->info.alias); } else { if (!(props =3D qemuBuildShmemBackendMemProps(shmem))) goto cleanup; @@ -3242,7 +3242,7 @@ qemuDomainAttachVsockDevice(virQEMUDriverPtr driver, if (qemuProcessOpenVhostVsock(vsock) < 0) goto cleanup; =20 - virAsprintf(&fdname, "%s%u", fdprefix, vsockPriv->vhostfd); + fdname =3D g_strdup_printf("%s%u", fdprefix, vsockPriv->vhostfd); =20 if (!(devstr =3D qemuBuildVsockDevStr(vm->def, vsock, priv->qemuCaps, = fdprefix))) goto cleanup; @@ -3975,7 +3975,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr dr= iver, (auth->expires && auth->validTo <=3D now)) { expire =3D "now"; } else if (auth->expires) { - virAsprintf(&validTo, "%lu", (unsigned long)auth->validTo); + validTo =3D g_strdup_printf("%lu", (unsigned long)auth->validTo); expire =3D validTo; } else { expire =3D "never"; @@ -4330,7 +4330,7 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, VIR_DEBUG("Removing memory device %s from domain %p %s", mem->info.alias, vm, vm->def->name); =20 - virAsprintf(&backendAlias, "mem%s", mem->info.alias); + backendAlias =3D g_strdup_printf("mem%s", mem->info.alias); =20 qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorDelObject(priv->mon, backendAlias); @@ -4548,7 +4548,7 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, VIR_DEBUG("Removing network interface %s from domain %p %s", net->info.alias, vm, vm->def->name); =20 - virAsprintf(&hostnet_name, "host%s", net->info.alias); + hostnet_name =3D g_strdup_printf("host%s", net->info.alias); if (!(charDevAlias =3D qemuAliasChardevFromDevAlias(net->info.alias))) return -1; =20 @@ -4703,7 +4703,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, rng->info.alias, vm, vm->def->name); =20 =20 - virAsprintf(&objAlias, "obj%s", rng->info.alias); + objAlias =3D g_strdup_printf("obj%s", rng->info.alias); =20 if (!(charAlias =3D qemuAliasChardevFromDevAlias(rng->info.alias))) return -1; @@ -4762,9 +4762,9 @@ qemuDomainRemoveShmemDevice(virQEMUDriverPtr driver, shmem->info.alias, vm, vm->def->name); =20 if (shmem->server.enabled) { - virAsprintf(&charAlias, "char%s", shmem->info.alias); + charAlias =3D g_strdup_printf("char%s", shmem->info.alias); } else { - virAsprintf(&memAlias, "shmmem-%s", shmem->info.alias); + memAlias =3D g_strdup_printf("shmmem-%s", shmem->info.alias); } =20 qemuDomainObjEnterMonitor(driver, vm); @@ -6005,7 +6005,7 @@ qemuDomainHotplugAddVcpu(virQEMUDriverPtr driver, size_t i; =20 if (newhotplug) { - virAsprintf(&vcpupriv->alias, "vcpu%u", vcpu); + vcpupriv->alias =3D g_strdup_printf("vcpu%u", vcpu); =20 if (!(vcpuprops =3D qemuBuildHotpluggableCPUProps(vcpuinfo))) goto cleanup; diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 8377b4d01d..dff4b3d76d 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -365,7 +365,7 @@ qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr= cfg, virCommandAbort(cmd); =20 if (errbuf && *errbuf) - virAsprintf(&errstr, "\nstderr=3D%s", errbuf); + errstr =3D g_strdup_printf("\nstderr=3D%s", errbuf); =20 virReportError(VIR_ERR_INTERNAL_ERROR, _("%s: failed to communicate with bridge helper: %s%s"), diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c index 00b86fde83..cbabde45df 100644 --- a/src/qemu/qemu_interop_config.c +++ b/src/qemu/qemu_interop_config.c @@ -57,7 +57,7 @@ qemuBuildFileList(virHashTablePtr files, const char *dir) =20 filename =3D g_strdup(ent->d_name); =20 - virAsprintf(&path, "%s/%s", dir, filename); + path =3D g_strdup_printf("%s/%s", dir, filename); =20 if (stat(path, &sb) < 0) { virReportSystemError(errno, _("Unable to access %s"), path); @@ -121,10 +121,10 @@ qemuInteropFetchConfigs(const char *name, if (!home) return -1; =20 - virAsprintf(&xdgConfig, "%s/.config", home); + xdgConfig =3D g_strdup_printf("%s/.config", home); } =20 - virAsprintf(&homeConfig, "%s/qemu/%s", xdgConfig, name); + homeConfig =3D g_strdup_printf("%s/qemu/%s", xdgConfig, name); } =20 if (!(files =3D virHashCreate(10, virHashValueFree))) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index aad2f77cb7..0447aa73bf 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -818,8 +818,8 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr= driver, =20 copysrc->tlsAlias =3D g_strdup(tlsAlias); =20 - virAsprintf(©src->nodestorage, "migration-%s-storage", disk->dst); - virAsprintf(©src->nodeformat, "migration-%s-format", disk->dst); + copysrc->nodestorage =3D g_strdup_printf("migration-%s-storage", disk-= >dst); + copysrc->nodeformat =3D g_strdup_printf("migration-%s-format", disk->d= st); =20 /* Migration via blockdev-mirror was supported sooner than the auto-re= ad-only * feature was added to qemu */ @@ -864,11 +864,11 @@ qemuMigrationSrcNBDStorageCopyDriveMirror(virQEMUDriv= erPtr driver, int mon_ret; =20 if (strchr(host, ':')) { - virAsprintf(&nbd_dest, "nbd:[%s]:%d:exportname=3D%s", host, port, - diskAlias); + nbd_dest =3D g_strdup_printf("nbd:[%s]:%d:exportname=3D%s", host, = port, + diskAlias); } else { - virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=3D%s", host, port, - diskAlias); + nbd_dest =3D g_strdup_printf("nbd:%s:%d:exportname=3D%s", host, po= rt, + diskAlias); } =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, @@ -1831,7 +1831,7 @@ qemuMigrationDstGetURI(const char *migrateFrom, char *uri =3D NULL; =20 if (STREQ(migrateFrom, "stdio")) - virAsprintf(&uri, "fd:%d", migrateFd); + uri =3D g_strdup_printf("fd:%d", migrateFd); else uri =3D g_strdup(migrateFrom); =20 @@ -2255,7 +2255,7 @@ qemuMigrationDstPrepare(virDomainObjPtr vm, incFormat =3D "%s:[%s]:%d"; else incFormat =3D "%s:%s:%d"; - virAsprintf(&migrateFrom, incFormat, protocol, listenAddress, port= ); + migrateFrom =3D g_strdup_printf(incFormat, protocol, listenAddress= , port); } =20 inc =3D qemuProcessIncomingDefNew(priv->qemuCaps, listenAddress, @@ -2695,7 +2695,7 @@ qemuMigrationAnyParseURI(const char *uri, bool *wellF= ormed) /* For compatibility reasons tcp://... URIs are sent as tcp:... * We need to transform them to a well-formed URI before parsing. */ if (STRPREFIX(uri, "tcp:") && !STRPREFIX(uri + 4, "//")) { - virAsprintf(&tmp, "tcp://%s", uri + 4); + tmp =3D g_strdup_printf("tcp://%s", uri + 4); uri =3D tmp; } =20 @@ -2790,7 +2790,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, else incFormat =3D "%s:%s:%d"; =20 - virAsprintf(uri_out, incFormat, "tcp", hostname, port); + *uri_out =3D g_strdup_printf(incFormat, "tcp", hostname, port); } else { bool well_formed_uri; =20 @@ -2828,7 +2828,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, if (!(*uri_out =3D virURIFormat(uri))) goto cleanup; } else { - virAsprintf(uri_out, "%s:%d", uri_in, port); + *uri_out =3D g_strdup_printf("%s:%d", uri_in, port); } } else { port =3D uri->port; @@ -3294,7 +3294,7 @@ qemuMigrationSrcConnect(virQEMUDriverPtr driver, int ret =3D -1; =20 host =3D spec->dest.host.name; - virAsprintf(&port, "%d", spec->dest.host.port); + port =3D g_strdup_printf("%d", spec->dest.host.port); =20 spec->destType =3D MIGRATION_DEST_FD; spec->dest.fd.qemu =3D -1; diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 990f2b06d0..1e2babf325 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -141,7 +141,7 @@ qemuDomainExtractTLSSubject(const char *certdir) int ret; size_t subjectlen; =20 - virAsprintf(&certfile, "%s/server-cert.pem", certdir); + certfile =3D g_strdup_printf("%s/server-cert.pem", certdir); =20 if (virFileReadAll(certfile, 8192, &pemdata) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 6495447188..c533819f4d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -961,7 +961,7 @@ qemuMonitorNextCommandID(qemuMonitorPtr mon) { char *id; =20 - virAsprintf(&id, "libvirt-%d", ++mon->nextSerial); + id =3D g_strdup_printf("libvirt-%d", ++mon->nextSerial); return id; } =20 @@ -2560,8 +2560,8 @@ qemuMonitorMigrateToHost(qemuMonitorPtr mon, QEMU_CHECK_MONITOR(mon); =20 if (strchr(hostname, ':')) { - virAsprintf(&uri, "%s:[%s]:%d", protocol, hostname, port); - } else virAsprintf(&uri, "%s:%s:%d", protocol, hostname, port); + uri =3D g_strdup_printf("%s:[%s]:%d", protocol, hostname, port); + } else uri =3D g_strdup_printf("%s:%s:%d", protocol, hostname, port); =20 ret =3D qemuMonitorJSONMigrate(mon, flags, uri); =20 @@ -4246,20 +4246,20 @@ qemuMonitorGuestPanicEventInfoFormatMsg(qemuMonitor= EventPanicInfoPtr info) =20 switch (info->type) { case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_HYPERV: - virAsprintf(&ret, - "hyper-v: arg1=3D'0x%llx', arg2=3D'0x%llx', " - "arg3=3D'0x%llx', arg4=3D'0x%llx', arg5=3D'0x%llx'", - info->data.hyperv.arg1, info->data.hyperv.arg2, - info->data.hyperv.arg3, info->data.hyperv.arg4, - info->data.hyperv.arg5); + ret =3D g_strdup_printf( + "hyper-v: arg1=3D'0x%llx', arg2=3D'0x%llx', " + "arg3=3D'0x%llx', arg4=3D'0x%llx', arg5=3D'0= x%llx'", + info->data.hyperv.arg1, info->data.hyperv.ar= g2, + info->data.hyperv.arg3, info->data.hyperv.ar= g4, + info->data.hyperv.arg5); break; case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_S390: - virAsprintf(&ret, "s390: core=3D'%d' psw-mask=3D'0x%016llx' " - "psw-addr=3D'0x%016llx' reason=3D'%s'", - info->data.s390.core, - info->data.s390.psw_mask, - info->data.s390.psw_addr, - info->data.s390.reason); + ret =3D g_strdup_printf("s390: core=3D'%d' psw-mask=3D'0x%016llx' " + "psw-addr=3D'0x%016llx' reason=3D'%s'", + info->data.s390.core, + info->data.s390.psw_mask, + info->data.s390.psw_addr, + info->data.s390.reason); break; case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_NONE: case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_LAST: diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 697b302a7c..ab49cb5f54 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -7120,7 +7120,7 @@ qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon, =20 switch ((virStorageNetHostTransport)server->transport) { case VIR_STORAGE_NET_HOST_TRANS_TCP: - virAsprintf(&port_str, "%u", server->port); + port_str =3D g_strdup_printf("%u", server->port); addr =3D qemuMonitorJSONBuildInetSocketAddress(server->name, port_= str); break; case VIR_STORAGE_NET_HOST_TRANS_UNIX: @@ -8051,7 +8051,7 @@ qemuMonitorJSONSetIOThread(qemuMonitorPtr mon, char *path =3D NULL; qemuMonitorJSONObjectProperty prop; =20 - virAsprintf(&path, "/objects/iothread%u", iothreadInfo->iothread_id); + path =3D g_strdup_printf("/objects/iothread%u", iothreadInfo->iothread= _id); =20 #define VIR_IOTHREAD_SET_PROP(propName, propVal) \ if (iothreadInfo->set_##propVal) { \ @@ -8209,11 +8209,11 @@ qemuMonitorJSONFindObjectPathByAlias(qemuMonitorPtr= mon, if (npaths < 0) return -1; =20 - virAsprintf(&child, "child<%s>", name); + child =3D g_strdup_printf("child<%s>", name); =20 for (i =3D 0; i < npaths; i++) { if (STREQ(paths[i]->name, alias) && STREQ(paths[i]->type, child)) { - virAsprintf(path, "/machine/peripheral/%s", alias); + *path =3D g_strdup_printf("/machine/peripheral/%s", alias); =20 ret =3D 0; goto cleanup; @@ -8265,7 +8265,7 @@ qemuMonitorJSONFindObjectPathByName(qemuMonitorPtr mo= n, if (STREQ_NULLABLE(paths[i]->type, name)) { VIR_DEBUG("Path to '%s' is '%s/%s'", name, curpath, paths[i]->= name); ret =3D 0; - virAsprintf(path, "%s/%s", curpath, paths[i]->name); + *path =3D g_strdup_printf("%s/%s", curpath, paths[i]->name); goto cleanup; } =20 @@ -8273,7 +8273,7 @@ qemuMonitorJSONFindObjectPathByName(qemuMonitorPtr mo= n, * traversed looking for more entries */ if (paths[i]->type && STRPREFIX(paths[i]->type, "child<")) { - virAsprintf(&nextpath, "%s/%s", curpath, paths[i]->name); + nextpath =3D g_strdup_printf("%s/%s", curpath, paths[i]->name); =20 ret =3D qemuMonitorJSONFindObjectPathByName(mon, nextpath, nam= e, path); VIR_FREE(nextpath); @@ -8316,7 +8316,7 @@ qemuMonitorJSONFindLinkPath(qemuMonitorPtr mon, return ret; } =20 - virAsprintf(&linkname, "link<%s>", name); + linkname =3D g_strdup_printf("link<%s>", name); =20 ret =3D qemuMonitorJSONFindObjectPathByName(mon, "/", linkname, path); VIR_FREE(linkname); diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index a5b2d2ccfd..9054682d60 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -42,7 +42,7 @@ int qemuMonitorTextAddDrive(qemuMonitorPtr mon, =20 /* 'dummy' here is just a placeholder since there is no PCI * address required when attaching drives to a controller */ - virAsprintf(&cmd, "drive_add dummy %s", drivestr); + cmd =3D g_strdup_printf("drive_add dummy %s", drivestr); =20 if (qemuMonitorJSONHumanCommand(mon, cmd, &reply) < 0) goto cleanup; @@ -91,7 +91,7 @@ int qemuMonitorTextDriveDel(qemuMonitorPtr mon, char *reply =3D NULL; int ret =3D -1; =20 - virAsprintf(&cmd, "drive_del %s", drivestr); + cmd =3D g_strdup_printf("drive_del %s", drivestr); =20 if (qemuMonitorJSONHumanCommand(mon, cmd, &reply) < 0) goto cleanup; @@ -129,7 +129,7 @@ qemuMonitorTextCreateSnapshot(qemuMonitorPtr mon, char *reply =3D NULL; int ret =3D -1; =20 - virAsprintf(&cmd, "savevm \"%s\"", name); + cmd =3D g_strdup_printf("savevm \"%s\"", name); =20 if (qemuMonitorJSONHumanCommand(mon, cmd, &reply)) goto cleanup; @@ -163,7 +163,7 @@ int qemuMonitorTextLoadSnapshot(qemuMonitorPtr mon, con= st char *name) int ret =3D -1; char *safename; =20 - virAsprintf(&cmd, "loadvm \"%s\"", name); + cmd =3D g_strdup_printf("loadvm \"%s\"", name); =20 if (qemuMonitorJSONHumanCommand(mon, cmd, &reply)) goto cleanup; @@ -206,7 +206,7 @@ int qemuMonitorTextDeleteSnapshot(qemuMonitorPtr mon, c= onst char *name) char *reply =3D NULL; int ret =3D -1; =20 - virAsprintf(&cmd, "delvm \"%s\"", name); + cmd =3D g_strdup_printf("delvm \"%s\"", name); if (qemuMonitorJSONHumanCommand(mon, cmd, &reply)) goto cleanup; =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 925fc44a70..0917ad98d1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -108,7 +108,7 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); =20 - virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name); + file =3D g_strdup_printf("%s/%s.xml", cfg->stateDir, vm->def->name); =20 if (unlink(file) < 0 && errno !=3D ENOENT && errno !=3D ENOTDIR) VIR_WARN("Failed to remove domain XML for %s: %s", @@ -2098,7 +2098,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, qemuMonitorChardevInfoPtr entry; =20 VIR_FREE(id); - virAsprintf(&id, "char%s", chr->info.alias); + id =3D g_strdup_printf("char%s", chr->info.alias); =20 entry =3D virHashLookup(info, id); if (!entry || !entry->ptyPath) { @@ -2187,7 +2187,7 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr= driver, if (chr->targetType =3D=3D VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRT= IO) { =20 VIR_FREE(id); - virAsprintf(&id, "char%s", chr->info.alias); + id =3D g_strdup_printf("char%s", chr->info.alias); =20 /* port state not reported */ if (!(entry =3D virHashLookup(info, id)) || @@ -3194,7 +3194,7 @@ qemuProcessPrepareMonitorChr(virDomainChrSourceDefPtr= monConfig, monConfig->type =3D VIR_DOMAIN_CHR_TYPE_UNIX; monConfig->data.nix.listen =3D true; =20 - virAsprintf(&monConfig->data.nix.path, "%s/monitor.sock", domainDir); + monConfig->data.nix.path =3D g_strdup_printf("%s/monitor.sock", domain= Dir); return 0; } =20 @@ -3400,8 +3400,8 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDo= mainObjPtr vm) } else { newState =3D VIR_DOMAIN_PAUSED; newReason =3D reason; - virAsprintf(&msg, "was paused (%s)", - virDomainPausedReasonTypeToString(reason)); + msg =3D g_strdup_printf("was paused (%s)", + virDomainPausedReasonTypeToString(reason= )); } } =20 @@ -4066,7 +4066,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, if (def->hyperv_features[i] !=3D VIR_TRISTATE_SWITCH_ON) continue; =20 - virAsprintf(&cpuFeature, "hv-%s", virDomainHypervTypeToString(i)); + cpuFeature =3D g_strdup_printf("hv-%s", virDomainHypervTypeToStrin= g(i)); =20 rc =3D virCPUDataCheckFeature(cpu, cpuFeature); VIR_FREE(cpuFeature); @@ -4898,8 +4898,8 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr drive= r, * default instead of tcp listen. */ if (useSocket) { memset(glisten, 0, sizeof(virDomainGraphicsListenDef)); - virAsprintf(&glisten->socket, "%s/%s.sock", priv->libD= ir, - type); + glisten->socket =3D g_strdup_printf("%s/%s.sock", priv= ->libDir, + type); glisten->fromConfig =3D true; glisten->type =3D VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCK= ET; } else if (listenAddr) { @@ -4920,8 +4920,8 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr drive= r, =20 case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: if (!glisten->socket) { - virAsprintf(&glisten->socket, "%s/%s.sock", priv->libDir, - type); + glisten->socket =3D g_strdup_printf("%s/%s.sock", priv->li= bDir, + type); glisten->autoGenerated =3D true; } break; @@ -5998,7 +5998,7 @@ qemuProcessSetupHotpluggableVcpus(virQEMUDriverPtr dr= iver, =20 if (vcpu->hotpluggable =3D=3D VIR_TRISTATE_BOOL_YES && vcpu->onlin= e && vcpupriv->vcpus !=3D 0) { - virAsprintf(&vcpupriv->alias, "vcpu%zu", i); + vcpupriv->alias =3D g_strdup_printf("vcpu%zu", i); =20 if (VIR_APPEND_ELEMENT(bootHotplug, nbootHotplug, vcpu) < 0) goto cleanup; @@ -8480,7 +8480,7 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) =20 VIR_DEBUG("proc=3D%p, emulator=3D%s", proc, proc->binary); =20 - virAsprintf(&template, "%s/qmp-XXXXXX", proc->libDir); + template =3D g_strdup_printf("%s/qmp-XXXXXX", proc->libDir); =20 if (!(proc->uniqDir =3D mkdtemp(template))) { virReportSystemError(errno, @@ -8493,16 +8493,16 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) if (qemuProcessQEMULabelUniqPath(proc) < 0) goto cleanup; =20 - virAsprintf(&proc->monpath, "%s/%s", proc->uniqDir, "qmp.monitor"); + proc->monpath =3D g_strdup_printf("%s/%s", proc->uniqDir, "qmp.monitor= "); =20 - virAsprintf(&proc->monarg, "unix:%s,server,nowait", proc->monpath); + proc->monarg =3D g_strdup_printf("unix:%s,server,nowait", proc->monpat= h); =20 /* * Normally we'd use runDir for pid files, but because we're using * -daemonize we need QEMU to be allowed to create them, rather * than libvirtd. So we're using libDir which QEMU can write to */ - virAsprintf(&proc->pidfile, "%s/%s", proc->uniqDir, "qmp.pid"); + proc->pidfile =3D g_strdup_printf("%s/%s", proc->uniqDir, "qmp.pid"); =20 ret =3D 0; =20 diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index c08a365548..5266b36eaa 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -156,7 +156,7 @@ qemuSlirpCreatePidFilename(virQEMUDriverConfigPtr cfg, if (!(shortName =3D virDomainDefGetShortName(def))) return NULL; =20 - virAsprintf(&name, "%s-%s-slirp", shortName, alias); + name =3D g_strdup_printf("%s-%s-slirp", shortName, alias); =20 return virPidFileBuildPath(cfg->slirpStateDir, name); } @@ -210,7 +210,7 @@ qemuSlirpGetDBusVMStateId(virDomainNetDefPtr net) char *id =3D NULL; =20 /* can't use alias, because it's not stable across restarts */ - virAsprintf(&id, "slirp-%s", virMacAddrFormat(&net->mac, macstr)); + id =3D g_strdup_printf("slirp-%s", virMacAddrFormat(&net->mac, macstr)= ); =20 return id; } @@ -227,8 +227,8 @@ qemuSlirpGetDBusPath(virQEMUDriverConfigPtr cfg, if (!(shortName =3D virDomainDefGetShortName(def))) return NULL; =20 - virAsprintf(&path, "%s/%s-%s-slirp", - cfg->slirpStateDir, shortName, alias); + path =3D g_strdup_printf("%s/%s-%s-slirp", + cfg->slirpStateDir, shortName, alias); =20 return path; } @@ -380,7 +380,7 @@ qemuSlirpStart(qemuSlirpPtr slirp, return -1; } =20 - virAsprintf(&dbus_addr, "unix:path=3D%s", dbus_path); + dbus_addr =3D g_strdup_printf("unix:path=3D%s", dbus_path); =20 virCommandAddArgFormat(cmd, "--dbus-id=3D%s", id); =20 diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index d6d418533c..62b9f803bd 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -78,7 +78,7 @@ qemuTPMCreateEmulatorStoragePath(const char *swtpmStorage= Dir, return NULL; } =20 - virAsprintf(&path, "%s/%s/%s", swtpmStorageDir, uuidstr, dir); + path =3D g_strdup_printf("%s/%s/%s", swtpmStorageDir, uuidstr, dir); return path; } =20 @@ -206,7 +206,7 @@ qemuTPMCreateEmulatorSocket(const char *swtpmStateDir, { char *path =3D NULL; =20 - virAsprintf(&path, "%s/%s-swtpm.sock", swtpmStateDir, shortName); + path =3D g_strdup_printf("%s/%s-swtpm.sock", swtpmStateDir, shortName); =20 return path; } @@ -249,7 +249,7 @@ qemuTPMEmulatorCreatePidFilename(const char *swtpmState= Dir, char *pidfile =3D NULL; char *devicename =3D NULL; =20 - virAsprintf(&devicename, "%s-swtpm", shortName); + devicename =3D g_strdup_printf("%s-swtpm", shortName); =20 pidfile =3D virPidFileBuildPath(swtpmStateDir, devicename); =20 @@ -332,7 +332,7 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, =20 /* create logfile name ... */ if (!tpm->data.emulator.logfile) - virAsprintf(&tpm->data.emulator.logfile, "%s/%s-swtpm.log", logDir= , vmname); + tpm->data.emulator.logfile =3D g_strdup_printf("%s/%s-swtpm.log", = logDir, vmname); =20 if (!virFileExists(tpm->data.emulator.logfile) && virFileTouch(tpm->data.emulator.logfile, 0644) < 0) { @@ -486,7 +486,7 @@ qemuTPMEmulatorRunSetup(const char *storagepath, goto cleanup; =20 virUUIDFormat(vmuuid, uuid); - virAsprintf(&vmid, "%s:%s", vmname, uuid); + vmid =3D g_strdup_printf("%s:%s", vmname, uuid); =20 virCommandSetUID(cmd, swtpm_user); virCommandSetGID(cmd, swtpm_group); diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c index 7355ae70f8..37e424eac3 100644 --- a/src/qemu/qemu_vhost_user_gpu.c +++ b/src/qemu/qemu_vhost_user_gpu.c @@ -47,7 +47,7 @@ qemuVhostUserGPUCreatePidFilename(const char *stateDir, { g_autofree char *devicename =3D NULL; =20 - virAsprintf(&devicename, "%s-%s-vhost-user-gpu", shortName, alias); + devicename =3D g_strdup_printf("%s-%s-vhost-user-gpu", shortName, alia= s); =20 return virPidFileBuildPath(stateDir, devicename); } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list