From nobody Sun Feb 8 18:24:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=1571752983; cv=none; d=zoho.com; s=zohoarc; b=jIxGqfevhaC1euQjjGKSVhBX9hQqfmxXDhCljUduQexhpb10356OqZJoO1ls4Vbl2SuFIAwyPuUvOMnw8NLEFkJbB/+rIDnMLmrec/VmOphRg0Nkx0IjGKkbGxzTGUxeN9kbTX8qFINnc3upIOzK4w8+S2L0xq79H4FppFt/6jY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752983; 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=CwhzNOrAtlzlyu39Rl29pnHYUB/yG/Kj7EGCymxkm20=; b=Frzrd+SOqak+kjuVkIN5R3diwJaTdPJKILZpd6q6bjuenwJR51ch2xQwQkHvOGHZJopKkjTFcwTXKZ1XT6MBxXoyfeYqVv2Ke6tdJKp4Ssss4x9zmD8WO+GM7eCSjIs/W4IBEmriOsJjwFQcqGi0sZiNNorTO38toImGvuYdP7Q= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571752983408246.186757657209; Tue, 22 Oct 2019 07:03:03 -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-148-Gwl6Sy4iNe6Zn_CbEXa_iQ-1; Tue, 22 Oct 2019 10:01:35 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC87B107AD3B; Tue, 22 Oct 2019 14:01:28 +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 9710F5DAAD; Tue, 22 Oct 2019 14:01:28 +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 3C2FF3FB43; Tue, 22 Oct 2019 14:01:28 +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 x9ME0xO6002886 for ; Tue, 22 Oct 2019 10:00:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3F9116055B; Tue, 22 Oct 2019 14:00:59 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4C4160167 for ; Tue, 22 Oct 2019 14:00:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752982; 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=CwhzNOrAtlzlyu39Rl29pnHYUB/yG/Kj7EGCymxkm20=; b=Z+HM35LE+kXEgCPVpY6X6eMs6nu+xWiehoiTvSA0hVe2BvgrqYiHM+LTyvS7pTZu/JKC9R AllSvbXYTwxHNm05ue5Jbzr4Mmz8K/4o0kPsAkTw+jRkZXRxabm7MBbNM84soUriGdV1Wr trNNgxgj8KjGIQPtaGOXNgXINEUVL28= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:08 +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 64/75] vz: 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.14 X-MC-Unique: Gwl6Sy4iNe6Zn_CbEXa_iQ-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 --- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 32 +++++++++++++++----------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index adde179951..54413fdc67 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2955,7 +2955,7 @@ vzMigrationCreateURI(void) goto cleanup; } =20 - virAsprintf(&uri, "vzmigr://%s", hostname); + uri =3D g_strdup_printf("vzmigr://%s", hostname); =20 cleanup: VIR_FREE(hostname); diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 9e2bddf6df..70bbde5e1d 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1213,22 +1213,22 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomai= nChrDefPtr chr) break; case PDT_USE_TCP: chr->source->type =3D VIR_DOMAIN_CHR_TYPE_TCP; - virAsprintf(&uristr, "tcp://%s", friendlyName); + uristr =3D g_strdup_printf("tcp://%s", friendlyName); if (!(uri =3D virURIParse(uristr))) goto cleanup; chr->source->data.tcp.host =3D g_strdup(uri->server); - virAsprintf(&chr->source->data.tcp.service, "%d", uri->port); + chr->source->data.tcp.service =3D g_strdup_printf("%d", uri->port); chr->source->data.tcp.listen =3D socket_mode =3D=3D PSP_SERIAL_SOC= KET_SERVER; break; case PDT_USE_UDP: chr->source->type =3D VIR_DOMAIN_CHR_TYPE_UDP; - virAsprintf(&uristr, "udp://%s", friendlyName); + uristr =3D g_strdup_printf("udp://%s", friendlyName); if (!(uri =3D virURIParse(uristr))) goto cleanup; chr->source->data.udp.bindHost =3D g_strdup(uri->server); - virAsprintf(&chr->source->data.udp.bindService, "%d", uri->port); + chr->source->data.udp.bindService =3D g_strdup_printf("%d", uri->p= ort); chr->source->data.udp.connectHost =3D g_strdup(uri->server); - virAsprintf(&chr->source->data.udp.connectService, "%d", uri->port= ); + chr->source->data.udp.connectService =3D g_strdup_printf("%d", uri= ->port); break; default: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3123,16 +3123,16 @@ static int prlsdkAddSerial(PRL_HANDLE sdkdom, virDo= mainChrDefPtr chr) break; case VIR_DOMAIN_CHR_TYPE_TCP: emutype =3D PDT_USE_TCP; - virAsprintf(&url, "%s:%s", chr->source->data.tcp.host, - chr->source->data.tcp.service); + url =3D g_strdup_printf("%s:%s", chr->source->data.tcp.host, + chr->source->data.tcp.service); if (!chr->source->data.tcp.listen) socket_mode =3D PSP_SERIAL_SOCKET_CLIENT; path =3D url; break; case VIR_DOMAIN_CHR_TYPE_UDP: emutype =3D PDT_USE_UDP; - virAsprintf(&url, "%s:%s", chr->source->data.udp.bindHost, - chr->source->data.udp.bindService); + url =3D g_strdup_printf("%s:%s", chr->source->data.udp.bindHost, + chr->source->data.udp.bindService); path =3D url; break; default: @@ -3324,7 +3324,7 @@ static int prlsdkConfigureNet(vzDriverPtr driver G_GN= UC_UNUSED, if (!(tmpstr =3D virSocketAddrFormat(&net->guestIP.ips[i]->address= ))) goto cleanup; =20 - virAsprintf(&addrstr, "%s/%d", tmpstr, net->guestIP.ips[i]->prefix= ); + addrstr =3D g_strdup_printf("%s/%d", tmpstr, net->guestIP.ips[i]->= prefix); =20 VIR_FREE(tmpstr); pret =3D PrlStrList_AddItem(addrlist, addrstr); @@ -3779,8 +3779,8 @@ prlsdkAddFS(PRL_HANDLE sdkdom, virDomainFSDefPtr fs) prlsdkCheckRetGoto(pret, cleanup); =20 if (fs->type =3D=3D VIR_DOMAIN_FS_TYPE_VOLUME) { - virAsprintf(&storage, "libvirt://localhost/%s/%s", - fs->src->srcpool->pool, fs->src->srcpool->volume); + storage =3D g_strdup_printf("libvirt://localhost/%s/%s", + fs->src->srcpool->pool, fs->src->srcpool= ->volume); pret =3D PrlVmDevHd_SetStorageURL(sdkdisk, storage); prlsdkCheckRetGoto(pret, cleanup); } @@ -4393,8 +4393,7 @@ prlsdkGetBlockStats(PRL_HANDLE sdkstats, =20 =20 #define PRLSDK_GET_STAT_PARAM(VAL, TYPE, NAME) \ - if (virAsprintf(&name, "devices.%s%d.%s", prefix, idx, NAME) < 0) \ - goto cleanup; \ + name =3D g_strdup_printf("devices.%s%d.%s", prefix, idx, NAME); \ if (prlsdkExtractStatsParam(sdkstats, name, &stats->VAL) < 0) \ goto cleanup; \ VIR_FREE(name); @@ -4474,8 +4473,7 @@ prlsdkGetNetStats(PRL_HANDLE sdkstats, PRL_HANDLE sdk= dom, const char *device, prlsdkCheckRetGoto(pret, cleanup); =20 #define PRLSDK_GET_NET_COUNTER(VAL, NAME) \ - if (virAsprintf(&name, "net.nic%u.%s", net_index, NAME) < 0) \ - goto cleanup; \ + name =3D g_strdup_printf("net.nic%u.%s", net_index, NAME); \ if (prlsdkExtractStatsParam(sdkstats, name, &stats->VAL) < 0) \ goto cleanup; \ VIR_FREE(name); @@ -4506,7 +4504,7 @@ prlsdkGetVcpuStats(PRL_HANDLE sdkstats, int idx, unsi= gned long long *vtime) long long ptime =3D 0; int ret =3D -1; =20 - virAsprintf(&name, "guest.vcpu%u.time", (unsigned int)idx); + name =3D g_strdup_printf("guest.vcpu%u.time", (unsigned int)idx); if (prlsdkExtractStatsParam(sdkstats, name, &ptime) < 0) goto cleanup; *vtime =3D ptime =3D=3D -1 ? 0 : ptime; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list