From nobody Sat Feb 7 15:15:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1571317001; cv=none; d=zoho.com; s=zohoarc; b=RRVE6lnGysBv4W3moT3BlskTokiagt38hQYmrQunXZG0O85qOyphvLjEl0iE/0itp+ypsExvmUGS8zgvBsZvsDU7NAYN6b0jGD+EovJJgo7d/7yIuZsQlkuhrDokt4Opzxj1wJ5xaCfOP7DQ4Scy4Ktu86zKh8HgwT1zUagWHc0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571317001; h=Content-Type:Content-Transfer-Encoding:Cc: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=te2/Xz+9fDMko9VOi+E8BvHDb3CdWD3fYhY1wMw3x/s=; b=PvZPpKiTAX4NxPUHTgwnDf6PGW3Du9305WZiHiTIJV2ateBLDKRNBmq0QoDpU4CoI5PFh8ShplKce5RouzRXNQEFPqabGi9OwYsqkUE1LtXDKnAjsyOpmBhvEZlpM9sVEgyEKhABrStalDTmCnqVLNP/Ftf36L+e4SvmzaqXSdg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1571317001073239.20982329465153; Thu, 17 Oct 2019 05:56:41 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 431D04E925; Thu, 17 Oct 2019 12:56:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B3CF11001B28; Thu, 17 Oct 2019 12:56:38 +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 2E24318089C8; Thu, 17 Oct 2019 12:56:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9HCkwHL029370 for ; Thu, 17 Oct 2019 08:46:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 752BA60C4E; Thu, 17 Oct 2019 12:46:58 +0000 (UTC) Received: from mx1.redhat.com (ext-mx15.extmail.prod.ext.phx2.redhat.com [10.5.110.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6EA6060BE1 for ; Thu, 17 Oct 2019 12:46:55 +0000 (UTC) Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A97D930833CB for ; Thu, 17 Oct 2019 12:46:54 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id m15so3378365qtq.2 for ; Thu, 17 Oct 2019 05:46:54 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id l48sm1335454qtb.50.2019.10.17.05.46.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 05:46:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JKcB+sKOeIFtv/lt6pKtWWuq/XboBicBVZ4w9SOlXrQ=; b=MhbiLSD5LjHDIhZofhJtHl46zZzcEO+Pc4XWaaezjt1fcW4aW0cZ1R9tzuR0o/Sb7l lV74pBfeUoYkZliCr1WP4ozjfmJTuSAwuY9bhUvOOaB40zqfm2j9/3qQh12VDibIPaXP yDjgNjjaF01szB711LbcTtvXXrKIKftmql7vvfIidW+pLkWxe36Lbs4hHTTX32UDJIpr rPdoWmUJQiesm/+cNHL6rhHQ/0RaA5l2QnAH2Xcq/XU5HOztKB6CL8e/JJw/Ihx/4pqo gFp/xY59TKUJKYWRlQSw+3h5qX1iwYJR5n6a/kiulKmlaNuAXspvIqkxAkjT1Bkak9gK inOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JKcB+sKOeIFtv/lt6pKtWWuq/XboBicBVZ4w9SOlXrQ=; b=cfR50H/QnFHazKCCJXBzNv7p83ii1ZapZE6/YKrkVPBSJYYrMpbgZ9pVLqsagXCL2+ MXEXUqIzUiYxHLG9YDlQsY7sWcb/oNnmfrdN7CnotnfM7XL/JbKmCcDI0vXyAMpc20O9 PTJBCIxa9iMvTBjNqEi70572rIUrskV7cUy/bsSPWXYUeRpK0M2OO7BsccobMitkfsEF Xi2mGF8OFmUW+TApgPqGX6Txqfu5s/1620DfFuEAMLpJRAi1sgdHWS7oC3wnD2/CzsXf adajhwyBPLxO1RUXT0hclgzh8f7b3rbZNtP0pscWpkkyBXRm+A0hau15Wq8cFPdJGvai 5siQ== X-Gm-Message-State: APjAAAVnJAX+y7IA8J5B5m1cEsFcfnFZjf/7rJvpNhoIJlYtpzSO2KKf VgOJkFRn4q+3f3sF59sejaMnOvNI X-Google-Smtp-Source: APXvYqxzClq345+O+P0QdGylaWiO4kZZ67nD5fvYVPj+BIRU5cVSITdgTynhIFRaVh18BGOhlP6iwQ== X-Received: by 2002:ac8:2a66:: with SMTP id l35mr3741098qtl.340.1571316413668; Thu, 17 Oct 2019 05:46:53 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Thu, 17 Oct 2019 09:46:40 -0300 Message-Id: <20191017124640.4311-5-danielhb413@gmail.com> In-Reply-To: <20191017124640.4311-1-danielhb413@gmail.com> References: <20191017124640.4311-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 17 Oct 2019 12:46:54 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 17 Oct 2019 12:46:54 +0000 (UTC) for IP:'209.85.160.196' DOMAIN:'mail-qt1-f196.google.com' HELO:'mail-qt1-f196.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.153 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.196 mail-qt1-f196.google.com 209.85.160.196 mail-qt1-f196.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.44 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v3 4/4] qemu_process.c: use g_strdup_printf 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 17 Oct 2019 12:56:39 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This patch changes all virAsprintf calls to use the GLib API g_strdup_printf in qemu_process.c. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_process.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8843ed20da..1a168fbb76 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -110,7 +110,7 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 - if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) < 0) + if (!(file =3D g_strdup_printf("%s/%s.xml", cfg->stateDir, vm->def->na= me))) return -1; =20 if (unlink(file) < 0 && errno !=3D ENOENT && errno !=3D ENOTDIR) @@ -2089,7 +2089,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, qemuMonitorChardevInfoPtr entry; =20 VIR_FREE(id); - if (virAsprintf(&id, "char%s", chr->info.alias) < 0) + if (!(id =3D g_strdup_printf("char%s", chr->info.alias))) return -1; =20 entry =3D virHashLookup(info, id); @@ -2177,7 +2177,7 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr= driver, if (chr->targetType =3D=3D VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRT= IO) { =20 VIR_FREE(id); - if (virAsprintf(&id, "char%s", chr->info.alias) < 0) + if (!(id =3D g_strdup_printf("char%s", chr->info.alias))) return -1; =20 /* port state not reported */ @@ -3172,8 +3172,7 @@ qemuProcessPrepareMonitorChr(virDomainChrSourceDefPtr= monConfig, monConfig->type =3D VIR_DOMAIN_CHR_TYPE_UNIX; monConfig->data.nix.listen =3D true; =20 - if (virAsprintf(&monConfig->data.nix.path, "%s/monitor.sock", - domainDir) < 0) + if (!(monConfig->data.nix.path =3D g_strdup_printf("%s/monitor.sock", = domainDir))) return -1; return 0; } @@ -3376,8 +3375,8 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDo= mainObjPtr vm) } else { newState =3D VIR_DOMAIN_PAUSED; newReason =3D reason; - ignore_value(virAsprintf(&msg, "was paused (%s)", - virDomainPausedReasonTypeToString(reason)= )); + msg =3D g_strdup_printf("was paused (%s)", + virDomainPausedReasonTypeToString(reason= )); } } =20 @@ -4024,8 +4023,8 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, if (def->hyperv_features[i] !=3D VIR_TRISTATE_SWITCH_ON) continue; =20 - if (virAsprintf(&cpuFeature, "hv-%s", - virDomainHypervTypeToString(i)) < 0) + if (!(cpuFeature =3D g_strdup_printf("hv-%s", + virDomainHypervTypeToString(i))= )) return -1; =20 rc =3D virCPUDataCheckFeature(cpu, cpuFeature); @@ -4850,8 +4849,8 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr drive= r, * default instead of tcp listen. */ if (useSocket) { memset(glisten, 0, sizeof(virDomainGraphicsListenDef)); - if (virAsprintf(&glisten->socket, "%s/%s.sock", - priv->libDir, type) < 0) + if (!(glisten->socket =3D g_strdup_printf("%s/%s.sock", + priv->libDir, = type))) return -1; glisten->fromConfig =3D true; glisten->type =3D VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCK= ET; @@ -4874,8 +4873,8 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr drive= r, =20 case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: if (!glisten->socket) { - if (virAsprintf(&glisten->socket, "%s/%s.sock", - priv->libDir, type) < 0) + if (!(glisten->socket =3D g_strdup_printf("%s/%s.sock", + priv->libDir, type= ))) return -1; glisten->autoGenerated =3D true; } @@ -5944,7 +5943,7 @@ qemuProcessSetupHotpluggableVcpus(virQEMUDriverPtr dr= iver, =20 if (vcpu->hotpluggable =3D=3D VIR_TRISTATE_BOOL_YES && vcpu->onlin= e && vcpupriv->vcpus !=3D 0) { - if (virAsprintf(&vcpupriv->alias, "vcpu%zu", i) < 0) + if (!(vcpupriv->alias =3D g_strdup_printf("vcpu%zu", i))) goto cleanup; =20 if (VIR_APPEND_ELEMENT(bootHotplug, nbootHotplug, vcpu) < 0) @@ -8401,7 +8400,7 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) =20 VIR_DEBUG("proc=3D%p, emulator=3D%s", proc, proc->binary); =20 - if (virAsprintf(&template, "%s/qmp-XXXXXX", proc->libDir) < 0) + if (!(template =3D g_strdup_printf("%s/qmp-XXXXXX", proc->libDir))) goto cleanup; =20 if (!(proc->uniqDir =3D mkdtemp(template))) { @@ -8415,11 +8414,10 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) if (qemuProcessQEMULabelUniqPath(proc) < 0) goto cleanup; =20 - if (virAsprintf(&proc->monpath, "%s/%s", proc->uniqDir, - "qmp.monitor") < 0) + if (!(proc->monpath =3D g_strdup_printf("%s/%s", proc->uniqDir, "qmp.m= onitor"))) goto cleanup; =20 - if (virAsprintf(&proc->monarg, "unix:%s,server,nowait", proc->monpath)= < 0) + if (!(proc->monarg =3D g_strdup_printf("unix:%s,server,nowait", proc->= monpath))) goto cleanup; =20 /* @@ -8427,7 +8425,7 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) * -daemonize we need QEMU to be allowed to create them, rather * than libvirtd. So we're using libDir which QEMU can write to */ - if (virAsprintf(&proc->pidfile, "%s/%s", proc->uniqDir, "qmp.pid") < 0) + if (!(proc->pidfile =3D g_strdup_printf("%s/%s", proc->uniqDir, "qmp.p= id"))) goto cleanup; =20 ret =3D 0; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list