From nobody Sun Feb 8 07:26:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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=1571576232; cv=none; d=zoho.com; s=zohoarc; b=cq9Qj9/RnruHwq64NTf1xmoRAoMQ0rpY766LZtAK+Q/kHx2EAzCSqcMDfPB9LSsy1O1drgUD4JwMcfsR5proFJKJERGYtB11aBP8cs8xUDS70oyyWQGd88+KPQr3qbOQmvL3+gCiD/8ju47cEjQymhMfx6/V3jfSzwTt2dk+mqk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571576232; 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=oxibPV2NJxzyEhocB61CHTS1T3Fqe6STb0ft+q2YIGc=; b=Ldl+TmDR9heES9aNzhGP847vnBZkDNRCoNbipjLFBhwUvkGFaGApcm1wFTZW09Ao+tIGUySWE0w1mnvlT4HgddTQaYOZHjZoHI6oe+G0uOH343kMLz8Z3rg071fIbZ0qfRO4kbyH2Ycaopj3GdU5UHvthDxYLurDE2gXsdJ/5zA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571576232531831.3676561249175; Sun, 20 Oct 2019 05:57:12 -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-363-3xAad6mKNry4zG_1KTj_PA-1; Sun, 20 Oct 2019 08:56:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3933C800D53; Sun, 20 Oct 2019 12:56:22 +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 0FF9E5D71C; Sun, 20 Oct 2019 12:56:22 +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 C8EA7180BAAA; Sun, 20 Oct 2019 12:56:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9KCu0aW023527 for ; Sun, 20 Oct 2019 08:56:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 40AD73CC8; Sun, 20 Oct 2019 12:56:00 +0000 (UTC) Received: from lpt.redhat.com (ovpn-200-23.brq.redhat.com [10.40.200.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F518194B9 for ; Sun, 20 Oct 2019 12:55:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571576231; 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=oxibPV2NJxzyEhocB61CHTS1T3Fqe6STb0ft+q2YIGc=; b=Lxm4hymJkFSOyP8cxvbLmGEXuQbk/uZtVFGEHwE9AXGEaUHmd1i6fkKVq6DIJQ0e+a97ha PJZMer0cls7nUMBgKzcGkg3F65oat8ogg0m9yZegcVbgaV9y3l6Q1EeztG+lo2t4tfUK3Z 1Es4MUMMgseEYK6tqoVk/G1shNMPLcQ= From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Sun, 20 Oct 2019 14:55:40 +0200 Message-Id: <6bdb7485b3fcc99ad40ad93193ea41c6ec4e2262.1571575889.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 22/34] qemu: use g_strdup instead of VIR_STRDUP 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.15 X-MC-Unique: 3xAad6mKNry4zG_1KTj_PA-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" Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a =3D g_strdup(b); Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_agent.c | 51 +++++-------- src/qemu/qemu_alias.c | 9 +-- src/qemu/qemu_block.c | 46 +++++------- src/qemu/qemu_blockjob.c | 9 +-- src/qemu/qemu_capabilities.c | 85 +++++++++------------- src/qemu/qemu_cgroup.c | 5 +- src/qemu/qemu_checkpoint.c | 12 ++-- src/qemu/qemu_command.c | 15 ++-- src/qemu/qemu_conf.c | 55 +++++--------- src/qemu/qemu_dbus.c | 7 +- src/qemu/qemu_domain.c | 50 +++++-------- src/qemu/qemu_driver.c | 72 +++++++------------ src/qemu/qemu_firmware.c | 44 +++++------- src/qemu/qemu_hotplug.c | 9 +-- src/qemu/qemu_interface.c | 6 +- src/qemu/qemu_interop_config.c | 6 +- src/qemu/qemu_migration.c | 26 +++---- src/qemu/qemu_migration_cookie.c | 21 ++---- src/qemu/qemu_migration_params.c | 10 +-- src/qemu/qemu_monitor.c | 14 ++-- src/qemu/qemu_monitor_json.c | 120 +++++++++++-------------------- src/qemu/qemu_process.c | 57 ++++++--------- src/qemu/qemu_vhost_user.c | 6 +- 23 files changed, 260 insertions(+), 475 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index bd5b8035ca..4b914e6d3b 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1750,8 +1750,7 @@ qemuAgentGetHostname(qemuAgentPtr mon, goto cleanup; } =20 - if (VIR_STRDUP(*hostname, result) < 0) - goto cleanup; + *hostname =3D g_strdup(result); =20 ret =3D 0; =20 @@ -1911,22 +1910,21 @@ qemuAgentFSInfoToPublic(qemuAgentFSInfoPtr agent) virDomainFSInfoPtr ret =3D NULL; size_t i; =20 - if (VIR_ALLOC(ret) < 0 || - VIR_STRDUP(ret->mountpoint, agent->mountpoint) < 0 || - VIR_STRDUP(ret->name, agent->name) < 0 || - VIR_STRDUP(ret->fstype, agent->fstype) < 0) + if (VIR_ALLOC(ret) < 0) goto error; =20 + ret->mountpoint =3D g_strdup(agent->mountpoint); + ret->name =3D g_strdup(agent->name); + ret->fstype =3D g_strdup(agent->fstype); + if (agent->disks && VIR_ALLOC_N(ret->devAlias, agent->ndisks) < 0) goto error; =20 ret->ndevAlias =3D agent->ndisks; =20 - for (i =3D 0; i < ret->ndevAlias; i++) { - if (VIR_STRDUP(ret->devAlias[i], agent->disks[i]->alias) < 0) - goto error; - } + for (i =3D 0; i < ret->ndevAlias; i++) + ret->devAlias[i] =3D g_strdup(agent->disks[i]->alias); =20 return ret; =20 @@ -1980,15 +1978,11 @@ qemuAgentGetFSInfoInternalDisk(virJSONValuePtr json= disks, return -1; disk =3D fsinfo->disks[i]; =20 - if ((val =3D virJSONValueObjectGetString(jsondisk, "serial"))) { - if (VIR_STRDUP(disk->serial, val) < 0) - return -1; - } + if ((val =3D virJSONValueObjectGetString(jsondisk, "serial"))) + disk->serial =3D g_strdup(val); =20 - if ((val =3D virJSONValueObjectGetString(jsondisk, "dev"))) { - if (VIR_STRDUP(disk->devnode, val) < 0) - return -1; - } + if ((val =3D virJSONValueObjectGetString(jsondisk, "dev"))) + disk->devnode =3D g_strdup(val); =20 #define GET_DISK_ADDR(jsonObject, var, name) \ do { \ @@ -2025,8 +2019,7 @@ qemuAgentGetFSInfoInternalDisk(virJSONValuePtr jsondi= sks, unit))) continue; =20 - if (VIR_STRDUP(disk->alias, diskDef->dst) < 0) - return -1; + disk->alias =3D g_strdup(diskDef->dst); } =20 return 0; @@ -2106,8 +2099,7 @@ qemuAgentGetFSInfoInternal(qemuAgentPtr mon, goto cleanup; } =20 - if (VIR_STRDUP(info_ret[i]->mountpoint, result) < 0) - goto cleanup; + info_ret[i]->mountpoint =3D g_strdup(result); =20 if (!(result =3D virJSONValueObjectGetString(entry, "name"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2115,8 +2107,7 @@ qemuAgentGetFSInfoInternal(qemuAgentPtr mon, goto cleanup; } =20 - if (VIR_STRDUP(info_ret[i]->name, result) < 0) - goto cleanup; + info_ret[i]->name =3D g_strdup(result); =20 if (!(result =3D virJSONValueObjectGetString(entry, "type"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2124,8 +2115,7 @@ qemuAgentGetFSInfoInternal(qemuAgentPtr mon, goto cleanup; } =20 - if (VIR_STRDUP(info_ret[i]->fstype, result) < 0) - goto cleanup; + info_ret[i]->fstype =3D g_strdup(result); =20 =20 /* 'used-bytes' and 'total-bytes' were added in qemu-ga 3.0 */ @@ -2404,12 +2394,10 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, iface =3D ifaces_ret[ifaces_count - 1]; iface->naddrs =3D 0; =20 - if (VIR_STRDUP(iface->name, ifname_s) < 0) - goto error; + iface->name =3D g_strdup(ifname_s); =20 hwaddr =3D virJSONValueObjectGetString(tmp_iface, "hardware-ad= dress"); - if (VIR_STRDUP(iface->hwaddr, hwaddr) < 0) - goto error; + iface->hwaddr =3D g_strdup(hwaddr); } =20 /* Has to be freed for each interface. */ @@ -2471,8 +2459,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, " field for interface '%s'"), name); goto error; } - if (VIR_STRDUP(ip_addr->addr, addr) < 0) - goto error; + ip_addr->addr =3D g_strdup(addr); =20 if (virJSONValueObjectGetNumberUint(ip_addr_obj, "prefix", &ip_addr->prefix) < 0) { diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index d4d8eb4252..f11099ce90 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -231,8 +231,7 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def, case VIR_DOMAIN_DISK_BUS_IDE: case VIR_DOMAIN_DISK_BUS_SATA: case VIR_DOMAIN_DISK_BUS_SCSI: - if (VIR_STRDUP(diskPriv->qomName, disk->info.alias) < 0) - return -1; + diskPriv->qomName =3D g_strdup(disk->info.alias); break; =20 case VIR_DOMAIN_DISK_BUS_VIRTIO: @@ -543,8 +542,7 @@ qemuAssignDeviceWatchdogAlias(virDomainWatchdogDefPtr w= atchdog) if (watchdog->info.alias) return 0; =20 - if (VIR_STRDUP(watchdog->info.alias, "watchdog0") < 0) - return -1; + watchdog->info.alias =3D g_strdup("watchdog0"); =20 return 0; } @@ -579,8 +577,7 @@ qemuAssignDeviceVsockAlias(virDomainVsockDefPtr vsock) { if (vsock->info.alias) return 0; - if (VIR_STRDUP(vsock->info.alias, "vsock0") < 0) - return -1; + vsock->info.alias =3D g_strdup("vsock0"); =20 return 0; } diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 515bcd3d59..c584d56e13 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -172,12 +172,11 @@ qemuBlockNodeNameGetBackingChainBacking(virJSONValueP= tr next, if (VIR_ALLOC(data) < 0) return -1; =20 - if (VIR_STRDUP(data->nodeformat, nodename) < 0 || - VIR_STRDUP(data->nodestorage, parentnodename) < 0 || - VIR_STRDUP(data->qemufilename, filename) < 0 || - VIR_STRDUP(data->drvformat, drvname) < 0 || - VIR_STRDUP(data->drvstorage, drvparent) < 0) - return -1; + data->nodeformat =3D g_strdup(nodename); + data->nodestorage =3D g_strdup(parentnodename); + data->qemufilename =3D g_strdup(filename); + data->drvformat =3D g_strdup(drvname); + data->drvstorage =3D g_strdup(drvparent); =20 if (backing && qemuBlockNodeNameGetBackingChainBacking(backing, nodenamestable, @@ -302,9 +301,8 @@ qemuBlockDiskDetectNodes(virDomainDiskDefPtr disk, =20 break; } else { - if (VIR_STRDUP(src->nodeformat, entry->nodeformat) < 0 || - VIR_STRDUP(src->nodestorage, entry->nodestorage) < 0) - goto cleanup; + src->nodeformat =3D g_strdup(entry->nodeformat); + src->nodestorage =3D g_strdup(entry->nodestorage); } =20 entry =3D entry->backing; @@ -423,9 +421,7 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) if (src->hosts->transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_TCP) { uri->port =3D src->hosts->port; =20 - if (VIR_STRDUP(uri->scheme, - virStorageNetProtocolTypeToString(src->protocol)) <= 0) - return NULL; + uri->scheme =3D g_strdup(virStorageNetProtocolTypeToString(src->pr= otocol)); } else { if (virAsprintf(&uri->scheme, "%s+%s", virStorageNetProtocolTypeToString(src->protocol), @@ -446,8 +442,7 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) } } =20 - if (VIR_STRDUP(uri->server, src->hosts->name) < 0) - return NULL; + uri->server =3D g_strdup(src->hosts->name); =20 return g_steal_pointer(&uri); } @@ -757,8 +752,7 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr= src, * } */ =20 - if (VIR_STRDUP(target, src->path) < 0) - return NULL; + target =3D g_strdup(src->path); =20 /* Separate the target and lun */ if ((lunStr =3D strchr(target, '/'))) { @@ -1685,23 +1679,17 @@ qemuBlockStorageSourceDetachPrepare(virStorageSourc= ePtr src, } =20 if (src->pr && - !virStoragePRDefIsManaged(src->pr) && - VIR_STRDUP(data->prmgrAlias, src->pr->mgralias) < 0) - goto cleanup; + !virStoragePRDefIsManaged(src->pr)) + data->prmgrAlias =3D g_strdup(src->pr->mgralias); =20 - if (VIR_STRDUP(data->tlsAlias, src->tlsAlias) < 0) - goto cleanup; + data->tlsAlias =3D g_strdup(src->tlsAlias); =20 if (srcpriv) { - if (srcpriv->secinfo && - srcpriv->secinfo->type =3D=3D VIR_DOMAIN_SECRET_INFO_TYPE_AES = && - VIR_STRDUP(data->authsecretAlias, srcpriv->secinfo->s.aes.alia= s) < 0) - goto cleanup; + if (srcpriv->secinfo && srcpriv->secinfo->type =3D=3D VIR_DOMAIN_S= ECRET_INFO_TYPE_AES) + data->authsecretAlias =3D g_strdup(srcpriv->secinfo->s.aes.ali= as); =20 - if (srcpriv->encinfo && - srcpriv->encinfo->type =3D=3D VIR_DOMAIN_SECRET_INFO_TYPE_AES = && - VIR_STRDUP(data->encryptsecretAlias, srcpriv->encinfo->s.aes.a= lias) < 0) - goto cleanup; + if (srcpriv->encinfo && srcpriv->encinfo->type =3D=3D VIR_DOMAIN_S= ECRET_INFO_TYPE_AES) + data->encryptsecretAlias =3D g_strdup(srcpriv->encinfo->s.aes.= alias); } =20 ret =3D g_steal_pointer(&data); diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 3506fa165b..6a7dd5a1d4 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -111,8 +111,7 @@ qemuBlockJobDataNew(qemuBlockJobType type, if (!(job =3D virObjectNew(qemuBlockJobDataClass))) return NULL; =20 - if (VIR_STRDUP(job->name, name) < 0) - return NULL; + job->name =3D g_strdup(name); =20 job->state =3D QEMU_BLOCKJOB_STATE_NEW; job->newstate =3D -1; @@ -483,8 +482,7 @@ qemuBlockJobRefreshJobs(virQEMUDriverPtr driver, * execute the finishing steps */ job->newstate =3D job->state; } else if (newstate =3D=3D QEMU_BLOCKJOB_STATE_CONCLUDED) { - if (VIR_STRDUP(job->errmsg, jobinfo[i]->error) < 0) - goto cleanup; + job->errmsg =3D g_strdup(jobinfo[i]->error); =20 if (job->errmsg) job->newstate =3D QEMU_BLOCKJOB_STATE_FAILED; @@ -1357,8 +1355,7 @@ qemuBlockJobEventProcessConcluded(qemuBlockJobDataPtr= job, if (STRNEQ_NULLABLE(job->name, jobinfo[i]->id)) continue; =20 - if (VIR_STRDUP(job->errmsg, jobinfo[i]->error) < 0) - rc =3D -1; + job->errmsg =3D g_strdup(jobinfo[i]->error); =20 if (job->errmsg) job->newstate =3D QEMU_BLOCKJOB_STATE_FAILED; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0377cea51a..e8d7cb84e2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -793,10 +793,8 @@ virQEMUCapsInitGuest(virCapsPtr caps, =20 /* RHEL doesn't follow the usual naming for QEMU binaries and ships * a single binary named qemu-kvm outside of $PATH instead */ - if (virQEMUCapsGuestIsNative(hostarch, guestarch) && !binary) { - if (VIR_STRDUP(binary, "/usr/libexec/qemu-kvm") < 0) - return -1; - } + if (virQEMUCapsGuestIsNative(hostarch, guestarch) && !binary) + binary =3D g_strdup("/usr/libexec/qemu-kvm"); =20 /* Ignore binary if extracting version info fails */ if (binary) { @@ -1582,11 +1580,12 @@ virQEMUCapsSEVInfoCopy(virSEVCapabilityPtr *dst, { g_autoptr(virSEVCapability) tmp =3D NULL; =20 - if (VIR_ALLOC(tmp) < 0 || - VIR_STRDUP(tmp->pdh, src->pdh) < 0 || - VIR_STRDUP(tmp->cert_chain, src->cert_chain) < 0) + if (VIR_ALLOC(tmp) < 0) return -1; =20 + tmp->pdh =3D g_strdup(src->pdh); + tmp->cert_chain =3D g_strdup(src->cert_chain); + tmp->cbitpos =3D src->cbitpos; tmp->reduced_phys_bits =3D src->reduced_phys_bits; =20 @@ -1606,8 +1605,7 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemu= Caps) ret->usedQMP =3D qemuCaps->usedQMP; ret->kvmSupportsNesting =3D qemuCaps->kvmSupportsNesting; =20 - if (VIR_STRDUP(ret->binary, qemuCaps->binary) < 0) - goto error; + ret->binary =3D g_strdup(qemuCaps->binary); =20 ret->ctime =3D qemuCaps->ctime; =20 @@ -1617,11 +1615,8 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qem= uCaps) ret->kvmVersion =3D qemuCaps->kvmVersion; ret->microcodeVersion =3D qemuCaps->microcodeVersion; =20 - if (VIR_STRDUP(ret->package, qemuCaps->package) < 0) - goto error; - - if (VIR_STRDUP(ret->kernelVersion, qemuCaps->kernelVersion) < 0) - goto error; + ret->package =3D g_strdup(qemuCaps->package); + ret->kernelVersion =3D g_strdup(qemuCaps->kernelVersion); =20 ret->arch =3D qemuCaps->arch; =20 @@ -1645,9 +1640,8 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemu= Caps) goto error; ret->nmachineTypes =3D qemuCaps->nmachineTypes; for (i =3D 0; i < qemuCaps->nmachineTypes; i++) { - if (VIR_STRDUP(ret->machineTypes[i].name, qemuCaps->machineTypes[i= ].name) < 0 || - VIR_STRDUP(ret->machineTypes[i].alias, qemuCaps->machineTypes[= i].alias) < 0) - goto error; + ret->machineTypes[i].name =3D g_strdup(qemuCaps->machineTypes[i].n= ame); + ret->machineTypes[i].alias =3D g_strdup(qemuCaps->machineTypes[i].= alias); ret->machineTypes[i].maxCpus =3D qemuCaps->machineTypes[i].maxCpus; ret->machineTypes[i].hotplugCpus =3D qemuCaps->machineTypes[i].hot= plugCpus; ret->machineTypes[i].qemuDefault =3D qemuCaps->machineTypes[i].qem= uDefault; @@ -1999,12 +1993,10 @@ int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr q= emuCaps, goto error; (*machines)[i] =3D mach; if (qemuCaps->machineTypes[i].alias) { - if (VIR_STRDUP(mach->name, qemuCaps->machineTypes[i].alias) < = 0 || - VIR_STRDUP(mach->canonical, qemuCaps->machineTypes[i].name= ) < 0) - goto error; + mach->name =3D g_strdup(qemuCaps->machineTypes[i].alias); + mach->canonical =3D g_strdup(qemuCaps->machineTypes[i].name); } else { - if (VIR_STRDUP(mach->name, qemuCaps->machineTypes[i].name) < 0) - goto error; + mach->name =3D g_strdup(qemuCaps->machineTypes[i].name); } mach->maxCpus =3D qemuCaps->machineTypes[i].maxCpus; } @@ -2039,8 +2031,7 @@ int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qem= uCaps, VIR_FREE(mach); goto error; } - if (VIR_STRDUP(mach->name, machine->canonical) < 0) - goto error; + mach->name =3D g_strdup(machine->canonical); mach->maxCpus =3D machine->maxCpus; i++; } @@ -2358,9 +2349,8 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCa= ps, =20 mach =3D &(qemuCaps->machineTypes[qemuCaps->nmachineTypes++]); =20 - if (VIR_STRDUP(mach->alias, machines[i]->alias) < 0 || - VIR_STRDUP(mach->name, machines[i]->name) < 0) - goto cleanup; + mach->alias =3D g_strdup(machines[i]->alias); + mach->name =3D g_strdup(machines[i]->name); =20 mach->maxCpus =3D machines[i]->maxCpus; mach->hotplugCpus =3D machines[i]->hotplugCpus; @@ -2467,8 +2457,7 @@ virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon, continue; =20 VIR_FREE(cpus[i]->name); - if (VIR_STRDUP(cpus[i]->name, *name) < 0) - goto error; + cpus[i]->name =3D g_strdup(*name); } } } @@ -2550,9 +2539,11 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps, model =3D "host"; } =20 - if (VIR_ALLOC(cpu) < 0 || VIR_STRDUP(cpu->model, model) < 0) + if (VIR_ALLOC(cpu) < 0) goto cleanup; =20 + cpu->model =3D g_strdup(model); + /* Some x86_64 features defined in cpu_map.xml use spelling which diff= er * from the one preferred by QEMU. Static expansion would give us only= the * preferred spelling. With new QEMU we always use the QEMU's canonical @@ -2661,9 +2652,7 @@ virQEMUCapsGetCPUFeatures(virQEMUCapsPtr qemuCaps, if (migratable && prop->migratable =3D=3D VIR_TRISTATE_BOOL_NO) continue; =20 - if (VIR_STRDUP(list[n++], - virQEMUCapsCPUFeatureFromQEMU(qemuCaps, prop->name)= ) < 0) - goto cleanup; + list[n++] =3D g_strdup(virQEMUCapsCPUFeatureFromQEMU(qemuCaps, pro= p->name)); } =20 *features =3D g_steal_pointer(&list); @@ -2672,7 +2661,6 @@ virQEMUCapsGetCPUFeatures(virQEMUCapsPtr qemuCaps, else ret =3D 0; =20 - cleanup: virStringListFree(list); return ret; } @@ -3022,8 +3010,8 @@ virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps, return 2; } =20 - if (VIR_STRDUP(cpu->model, modelInfo->name) < 0 || - VIR_ALLOC_N(cpu->features, modelInfo->nprops) < 0) + cpu->model =3D g_strdup(modelInfo->name); + if (VIR_ALLOC_N(cpu->features, modelInfo->nprops) < 0) return -1; =20 cpu->nfeatures_max =3D modelInfo->nprops; @@ -3037,8 +3025,7 @@ virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps, if (prop->type !=3D QEMU_MONITOR_CPU_PROPERTY_BOOLEAN) continue; =20 - if (VIR_STRDUP(feature->name, name) < 0) - return -1; + feature->name =3D g_strdup(name); =20 if (!prop->value.boolean || (migratable && prop->migratable =3D=3D VIR_TRISTATE_BOOL_NO)) @@ -4715,8 +4702,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, if (!(qemuCaps =3D virQEMUCapsNew())) goto error; =20 - if (VIR_STRDUP(qemuCaps->binary, binary) < 0) - goto error; + qemuCaps->binary =3D g_strdup(binary); =20 /* We would also want to check faccessat if we cared about ACLs, * but we don't. */ @@ -4749,8 +4735,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { qemuCaps->microcodeVersion =3D microcodeVersion; =20 - if (VIR_STRDUP(qemuCaps->kernelVersion, kernelVersion) < 0) - goto error; + qemuCaps->kernelVersion =3D g_strdup(kernelVersion); =20 qemuCaps->kvmSupportsNesting =3D virQEMUCapsKVMSupportsNesting(); } @@ -4791,8 +4776,7 @@ virQEMUCapsLoadFile(const char *filename, if (!qemuCaps) return NULL; =20 - if (VIR_STRDUP(qemuCaps->binary, binary) < 0) - goto error; + qemuCaps->binary =3D g_strdup(binary); =20 if (virQEMUCapsLoadCache(priv->hostArch, qemuCaps, filename) < 0) goto error; @@ -4875,8 +4859,7 @@ virQEMUCapsCacheNew(const char *libDir, goto error; virFileCacheSetPriv(cache, priv); =20 - if (VIR_STRDUP(priv->libDir, libDir) < 0) - goto error; + priv->libDir =3D g_strdup(libDir); =20 priv->hostArch =3D virArchFromHost(); =20 @@ -5192,9 +5175,7 @@ virQEMUCapsFillDomainLoaderCaps(virDomainCapsLoaderPt= r capsLoader, if (j !=3D capsLoader->values.nvalues) continue; =20 - if (VIR_STRDUP(capsLoader->values.values[capsLoader->values.nvalue= s], - filename) < 0) - return -1; + capsLoader->values.values[capsLoader->values.nvalues] =3D g_strdup= (filename); capsLoader->values.nvalues++; } =20 @@ -5590,11 +5571,9 @@ virQEMUCapsFillDomainFeatureSEVCaps(virQEMUCapsPtr q= emuCaps, if (VIR_ALLOC(sev) < 0) return -1; =20 - if (VIR_STRDUP(sev->pdh, cap->pdh) < 0) - return -1; + sev->pdh =3D g_strdup(cap->pdh); =20 - if (VIR_STRDUP(sev->cert_chain, cap->cert_chain) < 0) - return -1; + sev->cert_chain =3D g_strdup(cap->cert_chain); =20 sev->cbitpos =3D cap->cbitpos; sev->reduced_phys_bits =3D cap->reduced_phys_bits; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 5a58e77fa4..e49bb8fb7e 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -933,10 +933,7 @@ qemuInitCgroup(virDomainObjPtr vm, if (VIR_ALLOC(res) < 0) goto cleanup; =20 - if (VIR_STRDUP(res->partition, "/machine") < 0) { - VIR_FREE(res); - goto cleanup; - } + res->partition =3D g_strdup("/machine"); =20 vm->def->resource =3D res; } diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 4b4ad8bb83..4a618f5236 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -409,9 +409,8 @@ qemuCheckpointCreateXML(virDomainPtr domain, =20 other =3D virDomainCheckpointGetCurrent(vm->checkpoints); if (other) { - if (!redefine && - VIR_STRDUP(chk->def->parent_name, other->def->name) < 0) - goto endjob; + if (!redefine) + chk->def->parent_name =3D g_strdup(other->def->name); } =20 /* actually do the checkpoint */ @@ -513,11 +512,8 @@ qemuCheckpointReparentChildren(void *payload, =20 VIR_FREE(moment->def->parent_name); =20 - if (rep->parent->def && - VIR_STRDUP(moment->def->parent_name, rep->parent->def->name) < 0) { - rep->err =3D -1; - return 0; - } + if (rep->parent->def) + moment->def->parent_name =3D g_strdup(rep->parent->def->name); =20 rep->err =3D qemuCheckpointWriteMetadata(rep->vm, moment, rep->caps, rep->xmlopt, rep->dir); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b579b994f3..f24013f9eb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -799,8 +799,7 @@ qemuBuildGeneralSecinfoURI(virURIPtr uri, secinfo->s.plain.secret) < 0) return -1; } else { - if (VIR_STRDUP(uri->user, secinfo->s.plain.username) < 0) - return -1; + uri->user =3D g_strdup(secinfo->s.plain.username); } break; =20 @@ -1135,8 +1134,7 @@ qemuGetDriveSourceString(virStorageSourcePtr src, case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: case VIR_STORAGE_TYPE_DIR: - if (VIR_STRDUP(*source, src->path) < 0) - return -1; + *source =3D g_strdup(src->path); =20 break; =20 @@ -2053,8 +2051,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, * ourselves especially for cases when -blockdev will be used = */ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_DISK_DEVICE_ID)) { if (disk->serial) { - if (VIR_STRDUP(scsiVPDDeviceId, disk->serial) < 0) - goto error; + scsiVPDDeviceId =3D g_strdup(disk->serial); } else { if (!(scsiVPDDeviceId =3D qemuAliasDiskDriveFromDisk(d= isk))) goto error; @@ -3449,8 +3446,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendP= rops, def->mem.source =3D=3D VIR_DOMAIN_MEMORY_SOURCE_FILE) { =20 if (mem->nvdimmPath) { - if (VIR_STRDUP(memPath, mem->nvdimmPath) < 0) - return -1; + memPath =3D g_strdup(mem->nvdimmPath); if (!priv->memPrealloc) prealloc =3D true; } else if (useHugepage) { @@ -7044,8 +7040,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, return -1; } =20 - if (VIR_STRDUP(cpu, default_model) < 0) - return -1; + cpu =3D g_strdup(default_model); } =20 if (cpu) { diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 65cd959cf8..fae697a2ef 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -138,8 +138,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool priv= ileged) "%s/log/swtpm/libvirt/qemu", LOCALSTATEDIR) < 0) return NULL; =20 - if (VIR_STRDUP(cfg->configBaseDir, SYSCONFDIR "/libvirt") < 0) - return NULL; + cfg->configBaseDir =3D g_strdup(SYSCONFDIR "/libvirt"); =20 if (virAsprintf(&cfg->stateDir, "%s/libvirt/qemu", RUNSTATEDIR) < 0) @@ -242,15 +241,10 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool pr= ivileged) * This will then be used as a fallback if the service specific * directory doesn't exist (although we don't check if this exists). */ - if (VIR_STRDUP(cfg->defaultTLSx509certdir, - SYSCONFDIR "/pki/qemu") < 0) - return NULL; + cfg->defaultTLSx509certdir =3D g_strdup(SYSCONFDIR "/pki/qemu"); =20 - if (VIR_STRDUP(cfg->vncListen, VIR_LOOPBACK_IPV4_ADDR) < 0) - return NULL; - - if (VIR_STRDUP(cfg->spiceListen, VIR_LOOPBACK_IPV4_ADDR) < 0) - return NULL; + cfg->vncListen =3D g_strdup(VIR_LOOPBACK_IPV4_ADDR); + cfg->spiceListen =3D g_strdup(VIR_LOOPBACK_IPV4_ADDR); =20 cfg->remotePortMin =3D QEMU_REMOTE_PORT_MIN; cfg->remotePortMax =3D QEMU_REMOTE_PORT_MAX; @@ -271,10 +265,9 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool pri= vileged) return NULL; } =20 - if (VIR_STRDUP(cfg->bridgeHelperName, QEMU_BRIDGE_HELPER) < 0 || - VIR_STRDUP(cfg->prHelperName, QEMU_PR_HELPER) < 0 || - VIR_STRDUP(cfg->slirpHelperName, QEMU_SLIRP_HELPER) < 0) - return NULL; + cfg->bridgeHelperName =3D g_strdup(QEMU_BRIDGE_HELPER); + cfg->prHelperName =3D g_strdup(QEMU_PR_HELPER); + cfg->slirpHelperName =3D g_strdup(QEMU_SLIRP_HELPER); =20 cfg->clearEmulatorCapabilities =3D true; =20 @@ -386,10 +379,9 @@ virQEMUDriverConfigHugeTLBFSInit(virHugeTLBFSPtr huget= lbfs, const char *path, bool deflt) { - if (VIR_STRDUP(hugetlbfs->mnt_dir, path) < 0 || - virFileGetHugepageSize(path, &hugetlbfs->size) < 0) { + hugetlbfs->mnt_dir =3D g_strdup(path); + if (virFileGetHugepageSize(path, &hugetlbfs->size) < 0) return -1; - } =20 hugetlbfs->deflt =3D deflt; return 0; @@ -1151,10 +1143,7 @@ virQEMUDriverConfigSetDefaults(virQEMUDriverConfigPt= r cfg) if (!cfg->val## TLSx509certdir && \ !cfg->val## TLSx509secretUUID && \ cfg->defaultTLSx509secretUUID) { \ - if (VIR_STRDUP(cfg->val## TLSx509secretUUID, \ - cfg->defaultTLSx509secretUUID) < 0) { \ - return -1; \ - } \ + cfg->val## TLSx509secretUUID =3D g_strdup(cfg->defaultTLSx509s= ecretUUID); \ } \ } while (0) =20 @@ -1176,15 +1165,9 @@ virQEMUDriverConfigSetDefaults(virQEMUDriverConfigPt= r cfg) if (cfg->val ## TLSx509certdir) \ break; \ if (virFileExists(SYSCONFDIR "/pki/libvirt-"#val)) { \ - if (VIR_STRDUP(cfg->val ## TLSx509certdir, \ - SYSCONFDIR "/pki/libvirt-"#val) < 0) { \ - return -1; \ - } \ + cfg->val ## TLSx509certdir =3D g_strdup(SYSCONFDIR "/pki/libvi= rt-"#val); \ } else { \ - if (VIR_STRDUP(cfg->val ## TLSx509certdir, \ - cfg->defaultTLSx509certdir) < 0) { \ - return -1; \ - } \ + cfg->val ## TLSx509certdir =3D g_strdup(cfg->defaultTLSx509cer= tdir); \ } \ } while (0) =20 @@ -1276,9 +1259,8 @@ virCapsPtr virQEMUDriverCreateCapabilities(virQEMUDri= verPtr driver) virCapsHostSecModelPtr sm =3D &caps->host.secModels[i]; doi =3D qemuSecurityGetDOI(sec_managers[i]); model =3D qemuSecurityGetModel(sec_managers[i]); - if (VIR_STRDUP(sm->model, model) < 0 || - VIR_STRDUP(sm->doi, doi) < 0) - return NULL; + sm->model =3D g_strdup(model); + sm->doi =3D g_strdup(doi); =20 for (j =3D 0; j < G_N_ELEMENTS(virtTypes); j++) { lbl =3D qemuSecurityGetBaseLabel(sec_managers[i], virtTypes[j]= ); @@ -1587,19 +1569,20 @@ qemuSharedDeviceEntryInsert(virQEMUDriverPtr driver, * recorded in the table. */ if (!qemuSharedDeviceEntryDomainExists(entry, name, NULL)) { - if (VIR_EXPAND_N(entry->domains, entry->ref, 1) < 0 || - VIR_STRDUP(entry->domains[entry->ref - 1], name) < 0) { + if (VIR_EXPAND_N(entry->domains, entry->ref, 1) < 0) { /* entry is owned by the hash table here */ entry =3D NULL; goto error; } + entry->domains[entry->ref - 1] =3D g_strdup(name); } } else { if (VIR_ALLOC(entry) < 0 || - VIR_ALLOC_N(entry->domains, 1) < 0 || - VIR_STRDUP(entry->domains[0], name) < 0) + VIR_ALLOC_N(entry->domains, 1) < 0) goto error; =20 + entry->domains[0] =3D g_strdup(name); + entry->ref =3D 1; =20 if (virHashAddEntry(driver->sharedDevices, key, entry) < 0) diff --git a/src/qemu/qemu_dbus.c b/src/qemu/qemu_dbus.c index f4205a74bb..faee122021 100644 --- a/src/qemu/qemu_dbus.c +++ b/src/qemu/qemu_dbus.c @@ -42,11 +42,8 @@ qemuDBusVMStateNew(const char *id, const char *addr) if (VIR_ALLOC(self) < 0) return NULL; =20 - if (VIR_STRDUP(self->id, id) < 0) - return NULL; - - if (VIR_STRDUP(self->addr, addr) < 0) - return NULL; + self->id =3D g_strdup(id); + self->addr =3D g_strdup(addr); =20 return g_steal_pointer(&self); } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ab13eebd39..9b201a8259 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1407,14 +1407,12 @@ qemuDomainSecretPlainSetup(qemuDomainSecretInfoPtr = secinfo, return -1; =20 secinfo->type =3D VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN; - if (VIR_STRDUP(secinfo->s.plain.username, username) < 0) - goto cleanup; + secinfo->s.plain.username =3D g_strdup(username); =20 ret =3D virSecretGetSecretString(conn, seclookupdef, usageType, &secinfo->s.plain.secret, &secinfo->s.plain.secretlen); =20 - cleanup: virObjectUnref(conn); return ret; } @@ -1456,8 +1454,7 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv, return -1; =20 secinfo->type =3D VIR_DOMAIN_SECRET_INFO_TYPE_AES; - if (VIR_STRDUP(secinfo->s.aes.username, username) < 0) - goto cleanup; + secinfo->s.aes.username =3D g_strdup(username); =20 if (!(secinfo->s.aes.alias =3D qemuDomainGetSecretAESAlias(srcalias, i= sLuks))) goto cleanup; @@ -1865,8 +1862,7 @@ qemuDomainSecretGraphicsPrepare(virQEMUDriverConfigPt= r cfg, if (!cfg->vncTLS) return 0; =20 - if (VIR_STRDUP(gfxPriv->tlsAlias, "vnc-tls-creds0") < 0) - return -1; + gfxPriv->tlsAlias =3D g_strdup("vnc-tls-creds0"); =20 if (cfg->vncTLSx509secretUUID) { gfxPriv->secinfo =3D qemuDomainSecretInfoTLSNew(priv, gfxPriv->tls= Alias, @@ -4352,8 +4348,7 @@ qemuCanonicalizeMachine(virDomainDefPtr def, virQEMUC= apsPtr qemuCaps) =20 if (STRNEQ(canon, def->os.machine)) { char *tmp; - if (VIR_STRDUP(tmp, canon) < 0) - return -1; + tmp =3D g_strdup(canon); VIR_FREE(def->os.machine); def->os.machine =3D tmp; } @@ -10409,8 +10404,7 @@ qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr d= isk, else nodename =3D disk->src->nodeformat; =20 - if (VIR_STRDUP(*backendAlias, nodename) < 0) - return -1; + *backendAlias =3D g_strdup(nodename); =20 return 0; } @@ -12507,10 +12501,8 @@ qemuProcessPrepareStorageSourceTLSVxhs(virStorageS= ourcePtr src, src->tlsFromConfig =3D true; } =20 - if (src->haveTLS =3D=3D VIR_TRISTATE_BOOL_YES) { - if (VIR_STRDUP(src->tlsCertdir, cfg->vxhsTLSx509certdir) < 0) - return -1; - } + if (src->haveTLS =3D=3D VIR_TRISTATE_BOOL_YES) + src->tlsCertdir =3D g_strdup(cfg->vxhsTLSx509certdir); =20 return 0; } @@ -12536,8 +12528,7 @@ qemuProcessPrepareStorageSourceTLSNBD(virStorageSou= rcePtr src, return -1; } =20 - if (VIR_STRDUP(src->tlsCertdir, cfg->nbdTLSx509certdir) < 0) - return -1; + src->tlsCertdir =3D g_strdup(cfg->nbdTLSx509certdir); } =20 return 0; @@ -12876,15 +12867,14 @@ qemuDomainGetHostdevPath(virDomainDefPtr def, toAlloc =3D 2; =20 if (VIR_ALLOC_N(tmpPaths, toAlloc) < 0 || - VIR_ALLOC_N(tmpPerms, toAlloc) < 0 || - VIR_STRDUP(tmpPaths[0], tmpPath) < 0) + VIR_ALLOC_N(tmpPerms, toAlloc) < 0) goto cleanup; + tmpPaths[0] =3D g_strdup(tmpPath); tmpNpaths =3D toAlloc; tmpPerms[0] =3D perm; =20 if (includeVFIO) { - if (VIR_STRDUP(tmpPaths[1], QEMU_DEV_VFIO) < 0) - goto cleanup; + tmpPaths[1] =3D g_strdup(QEMU_DEV_VFIO); tmpPerms[1] =3D VIR_CGROUP_DEVICE_RW; } } @@ -13174,8 +13164,7 @@ qemuDomainCreateDeviceRecursive(const char *device, if (IS_RELATIVE_FILE_NAME(target)) { char *c =3D NULL, *tmp =3D NULL, *devTmp =3D NULL; =20 - if (VIR_STRDUP(devTmp, device) < 0) - goto cleanup; + devTmp =3D g_strdup(device); =20 if ((c =3D strrchr(devTmp, '/'))) *(c + 1) =3D '\0'; @@ -14152,8 +14141,7 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverP= tr driver, if (IS_RELATIVE_FILE_NAME(target)) { char *c =3D NULL, *tmp =3D NULL, *fileTmp =3D NULL; =20 - if (VIR_STRDUP(fileTmp, file) < 0) - goto cleanup; + fileTmp =3D g_strdup(file); =20 if ((c =3D strrchr(fileTmp, '/'))) *(c + 1) =3D '\0'; @@ -14438,10 +14426,11 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm, } =20 /* qemu-pr-helper might require access to /dev/mapper/control. */ - if (src->pr && - (VIR_STRDUP(dmPath, QEMU_DEVICE_MAPPER_CONTROL_PATH) < 0 || - VIR_APPEND_ELEMENT_COPY(paths, npaths, dmPath) < 0)) - goto cleanup; + if (src->pr) { + dmPath =3D g_strdup(QEMU_DEVICE_MAPPER_CONTROL_PATH); + if (VIR_APPEND_ELEMENT_COPY(paths, npaths, dmPath) < 0) + goto cleanup; + } =20 if (qemuDomainNamespaceMknodPaths(vm, paths, npaths) < 0) goto cleanup; @@ -15116,8 +15105,7 @@ qemuDomainPrepareStorageSourcePR(virStorageSourcePt= r src, VIR_FREE(src->pr->path); if (!(src->pr->path =3D qemuDomainGetManagedPRSocketPath(priv))) return -1; - if (VIR_STRDUP(src->pr->mgralias, qemuDomainGetManagedPRAlias()) <= 0) - return -1; + src->pr->mgralias =3D g_strdup(qemuDomainGetManagedPRAlias()); } else { if (!(src->pr->mgralias =3D qemuDomainGetUnmanagedPRAlias(parental= ias))) return -1; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 421a21818e..71947efa4e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1185,8 +1185,7 @@ qemuConnectURIProbe(char **uri) return 0; =20 cfg =3D virQEMUDriverGetConfig(qemu_driver); - if (VIR_STRDUP(*uri, cfg->uri) < 0) - return -1; + *uri =3D g_strdup(cfg->uri); =20 return 0; } @@ -7383,8 +7382,7 @@ static char *qemuConnectDomainXMLToNative(virConnectP= tr conn, virMacAddr mac =3D net->mac; char *script =3D net->script; =20 - if (VIR_STRDUP(model, virDomainNetGetModelString(net)) < 0) - goto cleanup; + model =3D g_strdup(virDomainNetGetModelString(net)); =20 net->script =3D NULL; =20 @@ -7761,9 +7759,8 @@ qemuDomainUndefineFlags(virDomainPtr dom, if (qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path) < 0) goto endjob; } else { - if (vm->def->os.loader && - VIR_STRDUP(nvram_path, vm->def->os.loader->nvram) < 0) - goto endjob; + if (vm->def->os.loader) + nvram_path =3D g_strdup(vm->def->os.loader->nvram); } =20 if (nvram_path && virFileExists(nvram_path)) { @@ -14639,10 +14636,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDr= iverPtr driver, =20 if (snapdisk->snapshot =3D=3D VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNA= L) { VIR_FREE(defdisk->src->path); - if (VIR_STRDUP(defdisk->src->path, snapdisk->src->path) < 0) { - /* we cannot rollback here in a sane way */ - goto cleanup; - } + defdisk->src->path =3D g_strdup(snapdisk->src->path); defdisk->src->format =3D snapdisk->src->format; =20 if (virDomainSaveConfig(cfg->configDir, driver->caps, vm->def)= < 0) @@ -15968,9 +15962,8 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, =20 current =3D virDomainSnapshotGetCurrent(vm->snapshots); if (current) { - if (!redefine && - VIR_STRDUP(snap->def->parent_name, current->def->name) < 0) - goto endjob; + if (!redefine) + snap->def->parent_name =3D g_strdup(current->def->name); } =20 /* actually do the snapshot */ @@ -16902,11 +16895,8 @@ qemuDomainMomentReparentChildren(void *payload, =20 VIR_FREE(moment->def->parent_name); =20 - if (rep->parent->def && - VIR_STRDUP(moment->def->parent_name, rep->parent->def->name) < 0) { - rep->err =3D -1; - return 0; - } + if (rep->parent->def) + moment->def->parent_name =3D g_strdup(rep->parent->def->name); =20 rep->err =3D rep->writeMetadata(rep->vm, moment, rep->caps, rep->xmlop= t, rep->dir); @@ -18316,8 +18306,7 @@ qemuDomainBlockRebase(virDomainPtr dom, const char = *path, const char *base, goto cleanup; dest->type =3D (flags & VIR_DOMAIN_BLOCK_REBASE_COPY_DEV) ? VIR_STORAGE_TYPE_BLOCK : VIR_STORAGE_TYPE_FILE; - if (VIR_STRDUP(dest->path, base) < 0) - goto cleanup; + dest->path =3D g_strdup(base); if (flags & VIR_DOMAIN_BLOCK_REBASE_COPY_RAW) dest->format =3D VIR_STORAGE_FILE_RAW; =20 @@ -18896,9 +18885,8 @@ qemuDomainSetBlockIoTuneDefaults(virDomainBlockIoTu= neInfoPtr newinfo, =20 if (!(set_fields & QEMU_BLOCK_IOTUNE_SET_SIZE_IOPS)) newinfo->size_iops_sec =3D oldinfo->size_iops_sec; - if (!(set_fields & QEMU_BLOCK_IOTUNE_SET_GROUP_NAME) && - VIR_STRDUP(newinfo->group_name, oldinfo->group_name) < 0) - return -1; + if (!(set_fields & QEMU_BLOCK_IOTUNE_SET_GROUP_NAME)) + newinfo->group_name =3D g_strdup(oldinfo->group_name); =20 /* The length field is handled a bit differently. If not defined/set, * QEMU will default these to 0 or 1 depending on whether something in @@ -19076,8 +19064,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, =20 /* NB: Cannot use macro since this is a value.s not a value.ul */ if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_GROUP_NAME)) { - if (VIR_STRDUP(info.group_name, param->value.s) < 0) - goto endjob; + info.group_name =3D g_strdup(param->value.s); set_fields |=3D QEMU_BLOCK_IOTUNE_SET_GROUP_NAME; if (virTypedParamsAddString(&eventParams, &eventNparams, &eventMaxparams, @@ -19374,8 +19361,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, =20 /* Group name needs to be copied since qemuMonitorGetBlockIoThrott= le * allocates it as well */ - if (VIR_STRDUP(reply.group_name, disk->blkdeviotune.group_name) < = 0) - goto endjob; + reply.group_name =3D g_strdup(disk->blkdeviotune.group_name); } =20 #define BLOCK_IOTUNE_ASSIGN(name, var) \ @@ -19493,8 +19479,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom, if (n =3D=3D nerrors) break; =20 - if (VIR_STRDUP(errors[n].disk, disk->dst) < 0) - goto endjob; + errors[n].disk =3D g_strdup(disk->dst); errors[n].error =3D info->io_status; n++; } @@ -20521,8 +20506,7 @@ qemuDomainGetResctrlMonData(virQEMUDriverPtr driver, if (!(res->vcpus =3D virBitmapFormat(domresmon->vcpus))) goto error; =20 - if (VIR_STRDUP(res->name, virResctrlMonitorGetID(monitor)) < 0) - goto error; + res->name =3D g_strdup(virResctrlMonitorGetID(monitor)); =20 if (virResctrlMonitorGetStats(monitor, (const char **)features, &res->stats, &res->nstats) < 0) @@ -21667,19 +21651,16 @@ qemuGetDHCPInterfaces(virDomainPtr dom, if (VIR_ALLOC_N(iface->addrs, iface->naddrs) < 0) goto error; =20 - if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0) - goto error; + iface->name =3D g_strdup(vm->def->nets[i]->ifname); =20 - if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) - goto error; + iface->hwaddr =3D g_strdup(macaddr); } =20 for (j =3D 0; j < n_leases; j++) { virNetworkDHCPLeasePtr lease =3D leases[j]; virDomainIPAddressPtr ip_addr =3D &iface->addrs[j]; =20 - if (VIR_STRDUP(ip_addr->addr, lease->ipaddr) < 0) - goto error; + ip_addr->addr =3D g_strdup(lease->ipaddr); =20 ip_addr->type =3D lease->type; ip_addr->prefix =3D lease->prefix; @@ -21739,18 +21720,15 @@ qemuARPGetInterfaces(virDomainObjPtr vm, if (VIR_ALLOC(iface) < 0) goto cleanup; =20 - if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0) - goto cleanup; + iface->name =3D g_strdup(vm->def->nets[i]->ifname); =20 - if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) - goto cleanup; + iface->hwaddr =3D g_strdup(macaddr); =20 if (VIR_ALLOC(iface->addrs) < 0) goto cleanup; iface->naddrs =3D 1; =20 - if (VIR_STRDUP(iface->addrs->addr, entry.ipaddr) < 0) - goto cleanup; + iface->addrs->addr =3D g_strdup(entry.ipaddr); =20 if (VIR_APPEND_ELEMENT(ifaces_ret, ifaces_count, iface) < = 0) goto cleanup; @@ -21851,8 +21829,7 @@ qemuDomainRenameCallback(virDomainObjPtr vm, =20 cfg =3D virQEMUDriverGetConfig(driver); =20 - if (VIR_STRDUP(new_dom_name, new_name) < 0) - goto cleanup; + new_dom_name =3D g_strdup(new_name); =20 if (!(new_dom_cfg_file =3D virDomainConfigFile(cfg->configDir, new_dom_name)) || @@ -22324,8 +22301,7 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, goto endjob; } =20 - if (VIR_STRDUP(nodename, src->nodestorage) < 0) - goto endjob; + nodename =3D g_strdup(src->nodestorage); =20 qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorSetBlockThreshold(priv->mon, nodename, threshold); diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index f614be6d14..670662fd4b 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -346,8 +346,7 @@ qemuFirmwareFlashFileParse(const char *path, return -1; } =20 - if (VIR_STRDUP(flash->filename, filename) < 0) - return -1; + flash->filename =3D g_strdup(filename); =20 if (!(format =3D virJSONValueObjectGetString(doc, "format"))) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -356,8 +355,7 @@ qemuFirmwareFlashFileParse(const char *path, return -1; } =20 - if (VIR_STRDUP(flash->format, format) < 0) - return -1; + flash->format =3D g_strdup(format); =20 return 0; } @@ -408,8 +406,7 @@ qemuFirmwareMappingKernelParse(const char *path, path); } =20 - if (VIR_STRDUP(kernel->filename, filename) < 0) - return -1; + kernel->filename =3D g_strdup(filename); =20 return 0; } @@ -428,8 +425,7 @@ qemuFirmwareMappingMemoryParse(const char *path, path); } =20 - if (VIR_STRDUP(memory->filename, filename) < 0) - return -1; + memory->filename =3D g_strdup(filename); =20 return 0; } @@ -547,8 +543,7 @@ qemuFirmwareTargetParse(const char *path, virJSONValuePtr machine =3D virJSONValueArrayGet(machines, j); g_autofree char *machineStr =3D NULL; =20 - if (VIR_STRDUP(machineStr, virJSONValueGetString(machine)) < 0) - goto cleanup; + machineStr =3D g_strdup(virJSONValueGetString(machine)); =20 VIR_APPEND_ELEMENT_INPLACE(t->machines, t->nmachines, machineS= tr); } @@ -1051,9 +1046,7 @@ qemuFirmwareEnableFeatures(virQEMUDriverPtr driver, } =20 VIR_FREE(def->os.loader->path); - if (VIR_STRDUP(def->os.loader->path, - flash->executable.filename) < 0) - return -1; + def->os.loader->path =3D g_strdup(flash->executable.filename); =20 if (STRNEQ(flash->nvram_template.format, "raw")) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, @@ -1063,9 +1056,7 @@ qemuFirmwareEnableFeatures(virQEMUDriverPtr driver, } =20 VIR_FREE(def->os.loader->templt); - if (VIR_STRDUP(def->os.loader->templt, - flash->nvram_template.filename) < 0) - return -1; + def->os.loader->templt =3D g_strdup(flash->nvram_template.filename= ); =20 if (qemuDomainNVRAMPathGenerate(cfg, def) < 0) return -1; @@ -1077,8 +1068,7 @@ qemuFirmwareEnableFeatures(virQEMUDriverPtr driver, =20 case QEMU_FIRMWARE_DEVICE_KERNEL: VIR_FREE(def->os.kernel); - if (VIR_STRDUP(def->os.kernel, kernel->filename) < 0) - return -1; + def->os.kernel =3D g_strdup(kernel->filename); =20 VIR_DEBUG("decided on kernel '%s'", def->os.kernel); @@ -1090,8 +1080,7 @@ qemuFirmwareEnableFeatures(virQEMUDriverPtr driver, return -1; =20 def->os.loader->type =3D VIR_DOMAIN_LOADER_TYPE_ROM; - if (VIR_STRDUP(def->os.loader->path, memory->filename) < 0) - return -1; + def->os.loader->path =3D g_strdup(memory->filename); =20 VIR_DEBUG("decided on loader '%s'", def->os.loader->path); @@ -1400,12 +1389,15 @@ qemuFirmwareGetSupported(const char *machine, break; } =20 - if (j =3D=3D *nfws && - (VIR_ALLOC(tmp) < 0 || - VIR_STRDUP(tmp->name, fwpath) < 0 || - VIR_STRDUP(tmp->nvram, nvrampath) < 0 || - VIR_APPEND_ELEMENT(*fws, *nfws, tmp) < 0)) - return -1; + if (j =3D=3D *nfws) { + if (VIR_ALLOC(tmp) < 0) + return -1; + + tmp->name =3D g_strdup(fwpath); + tmp->nvram =3D g_strdup(nvrampath); + if (VIR_APPEND_ELEMENT(*fws, *nfws, tmp) < 0) + return -1; + } } } =20 diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5b42bbfd48..4da6457bdc 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4243,8 +4243,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, =20 =20 if (blockdev) { - if (VIR_STRDUP(corAlias, diskPriv->nodeCopyOnRead) < 0) - goto cleanup; + corAlias =3D g_strdup(diskPriv->nodeCopyOnRead); =20 if (diskPriv->blockjob) { /* the block job keeps reference to the disk chain */ @@ -4987,10 +4986,8 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, * save the alias to use when sending a DEVICE_REMOVED event after * all other teardown is complete */ - if ((info =3D virDomainDeviceGetInfo(dev)) && - VIR_STRDUP(alias, info->alias) < 0) { - return -1; - } + if ((info =3D virDomainDeviceGetInfo(dev))) + alias =3D g_strdup(info->alias); info =3D NULL; =20 switch ((virDomainDeviceType)dev->type) { diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 6e3e634b30..70832e0c9a 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -457,8 +457,7 @@ qemuInterfaceEthernetConnect(virDomainDefPtr def, STRPREFIX(net->ifname, VIR_NET_GENERATED_TAP_PREFIX) || strchr(net->ifname, '%')) { VIR_FREE(net->ifname); - if (VIR_STRDUP(net->ifname, VIR_NET_GENERATED_TAP_PREFIX "%d")= < 0) - goto cleanup; + net->ifname =3D g_strdup(VIR_NET_GENERATED_TAP_PREFIX "%d"); /* avoid exposing vnet%d in getXMLDesc or error outputs */ template_ifname =3D true; } @@ -563,8 +562,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def, STRPREFIX(net->ifname, VIR_NET_GENERATED_TAP_PREFIX) || strchr(net->ifname, '%')) { VIR_FREE(net->ifname); - if (VIR_STRDUP(net->ifname, VIR_NET_GENERATED_TAP_PREFIX "%d") < 0) - goto cleanup; + net->ifname =3D g_strdup(VIR_NET_GENERATED_TAP_PREFIX "%d"); /* avoid exposing vnet%d in getXMLDesc or error outputs */ template_ifname =3D true; } diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c index 7193d31dfd..d05ff56221 100644 --- a/src/qemu/qemu_interop_config.c +++ b/src/qemu/qemu_interop_config.c @@ -55,8 +55,7 @@ qemuBuildFileList(virHashTablePtr files, const char *dir) if (STRPREFIX(ent->d_name, ".")) continue; =20 - if (VIR_STRDUP(filename, ent->d_name) < 0) - goto cleanup; + filename =3D g_strdup(ent->d_name); =20 if (virAsprintf(&path, "%s/%s", dir, filename) < 0) goto cleanup; @@ -115,8 +114,7 @@ qemuInteropFetchConfigs(const char *name, * much sense to parse files in root's home directory. It * makes sense only for session daemon which runs under * regular user. */ - if (VIR_STRDUP(xdgConfig, getenv("XDG_CONFIG_HOME")) < 0) - return -1; + xdgConfig =3D g_strdup(getenv("XDG_CONFIG_HOME")); =20 if (!xdgConfig) { g_autofree char *home =3D virGetUserDirectory(); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index fed95a285a..471cb1c5a6 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -192,8 +192,7 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, return 0; } =20 - if (VIR_STRDUP(basePath, disk->src->path) < 0) - goto cleanup; + basePath =3D g_strdup(disk->src->path); =20 if (!(volName =3D strrchr(basePath, '/'))) { virReportError(VIR_ERR_INVALID_ARG, @@ -808,8 +807,7 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr= driver, if (!(copysrc->backingStore =3D virStorageSourceNew())) return -1; =20 - if (VIR_STRDUP(copysrc->path, diskAlias) < 0) - return -1; + copysrc->path =3D g_strdup(diskAlias); =20 if (VIR_ALLOC_N(copysrc->hosts, 1) < 0) return -1; @@ -817,11 +815,9 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPt= r driver, copysrc->nhosts =3D 1; copysrc->hosts->transport =3D VIR_STORAGE_NET_HOST_TRANS_TCP; copysrc->hosts->port =3D port; - if (VIR_STRDUP(copysrc->hosts->name, host) < 0) - return -1; + copysrc->hosts->name =3D g_strdup(host); =20 - if (VIR_STRDUP(copysrc->tlsAlias, tlsAlias) < 0) - return -1; + copysrc->tlsAlias =3D g_strdup(tlsAlias); =20 if (virAsprintf(©src->nodestorage, "migration-%s-storage", disk->d= st) < 0 || virAsprintf(©src->nodeformat, "migration-%s-format", disk->dst= ) < 0) @@ -2218,8 +2214,7 @@ qemuMigrationDstPrepare(virDomainObjPtr vm, char *migrateFrom =3D NULL; =20 if (tunnel) { - if (VIR_STRDUP(migrateFrom, "stdio") < 0) - goto cleanup; + migrateFrom =3D g_strdup("stdio"); } else { bool encloseAddress =3D false; bool hostIPv6Capable =3D false; @@ -2434,8 +2429,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, *def =3D NULL; =20 priv =3D vm->privateData; - if (VIR_STRDUP(priv->origname, origname) < 0) - goto cleanup; + priv->origname =3D g_strdup(origname); =20 if (taint_hook) { /* Domain XML has been altered by a hook script. */ @@ -2780,8 +2774,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, if (virSocketAddrNumericFamily(migrateHost) =3D=3D AF_INET6) encloseAddress =3D true; =20 - if (VIR_STRDUP(hostname, migrateHost) < 0) - goto cleanup; + hostname =3D g_strdup(migrateHost); } else { if ((hostname =3D virGetHostname()) =3D=3D NULL) goto cleanup; @@ -2902,10 +2895,7 @@ qemuMigrationAnyPrepareDef(virQEMUDriverPtr driver, =20 if (dname) { name =3D def->name; - if (VIR_STRDUP(def->name, dname) < 0) { - virDomainDefFree(def); - def =3D NULL; - } + def->name =3D g_strdup(dname); } =20 cleanup: diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 244ad4fdf3..f625c7086b 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -214,8 +214,7 @@ qemuMigrationCookieGraphicsSpiceAlloc(virQEMUDriverPtr = driver, !(mig->tlsSubject =3D qemuDomainExtractTLSSubject(cfg->spiceTLSx50= 9certdir))) goto error; =20 - if (VIR_STRDUP(mig->listen, listenAddr) < 0) - goto error; + mig->listen =3D g_strdup(listenAddr); =20 virObjectUnref(cfg); return mig; @@ -293,8 +292,7 @@ qemuMigrationCookieNew(const virDomainDef *def, name =3D origname; else name =3D def->name; - if (VIR_STRDUP(mig->name, name) < 0) - goto error; + mig->name =3D g_strdup(name); memcpy(mig->uuid, def->uuid, VIR_UUID_BUFLEN); =20 if (!(mig->localHostname =3D virGetHostname())) @@ -380,17 +378,13 @@ qemuMigrationCookieAddLockstate(qemuMigrationCookiePt= r mig, } =20 if (virDomainObjGetState(dom, NULL) =3D=3D VIR_DOMAIN_PAUSED) { - if (VIR_STRDUP(mig->lockState, priv->lockState) < 0) - return -1; + mig->lockState =3D g_strdup(priv->lockState); } else { if (virDomainLockProcessInquire(driver->lockManager, dom, &mig->lo= ckState) < 0) return -1; } =20 - if (VIR_STRDUP(mig->lockDriver, virLockManagerPluginGetName(driver->lo= ckManager)) < 0) { - VIR_FREE(mig->lockState); - return -1; - } + mig->lockDriver =3D g_strdup(virLockManagerPluginGetName(driver->lockM= anager)); =20 mig->flags |=3D QEMU_MIGRATION_COOKIE_LOCKSTATE; mig->flagsMandatory |=3D QEMU_MIGRATION_COOKIE_LOCKSTATE; @@ -498,9 +492,7 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig, !(entry =3D virHashLookup(stats, disk->info.alias))) continue; =20 - if (VIR_STRDUP(mig->nbd->disks[mig->nbd->ndisks].target, - disk->dst) < 0) - goto cleanup; + mig->nbd->disks[mig->nbd->ndisks].target =3D g_strdup(disk->dst); mig->nbd->disks[mig->nbd->ndisks].capacity =3D entry->capacity; mig->nbd->ndisks++; } @@ -1516,8 +1508,7 @@ qemuMigrationEatCookie(virQEMUDriverPtr driver, mig->persistent && STRNEQ(def->name, mig->persistent->name)) { VIR_FREE(mig->persistent->name); - if (VIR_STRDUP(mig->persistent->name, def->name) < 0) - goto error; + mig->persistent->name =3D g_strdup(def->name); } =20 if (mig->flags & QEMU_MIGRATION_COOKIE_LOCKSTATE) { diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index 65f533e451..dca12033c0 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -658,8 +658,7 @@ qemuMigrationParamsFromJSON(virJSONValuePtr params) =20 case QEMU_MIGRATION_PARAM_TYPE_STRING: if ((str =3D virJSONValueObjectGetString(params, name))) { - if (VIR_STRDUP(pv->value.s, str) < 0) - goto error; + pv->value.s =3D g_strdup(str); pv->set =3D true; } break; @@ -667,10 +666,6 @@ qemuMigrationParamsFromJSON(virJSONValuePtr params) } =20 return migParams; - - error: - qemuMigrationParamsFree(migParams); - return NULL; } =20 =20 @@ -875,8 +870,7 @@ qemuMigrationParamsSetString(qemuMigrationParamsPtr mig= Params, if (qemuMigrationParamsCheckType(param, QEMU_MIGRATION_PARAM_TYPE_STRI= NG) < 0) return -1; =20 - if (VIR_STRDUP(migParams->params[param].value.s, value) < 0) - return -1; + migParams->params[param].value.s =3D g_strdup(value); =20 migParams->params[param].set =3D true; =20 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 86d3800108..7891d7e4c1 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2987,8 +2987,8 @@ qemuMonitorAddObject(qemuMonitorPtr mon, goto cleanup; } =20 - if (alias && VIR_STRDUP(tmp, id) < 0) - goto cleanup; + if (alias) + tmp =3D g_strdup(id); =20 ret =3D qemuMonitorJSONAddObject(mon, *props); *props =3D NULL; @@ -3635,15 +3635,13 @@ qemuMonitorCPUModelInfoCopy(const qemuMonitorCPUMod= elInfo *orig) if (VIR_ALLOC_N(copy->props, orig->nprops) < 0) goto error; =20 - if (VIR_STRDUP(copy->name, orig->name) < 0) - goto error; + copy->name =3D g_strdup(orig->name); =20 copy->migratability =3D orig->migratability; copy->nprops =3D orig->nprops; =20 for (i =3D 0; i < orig->nprops; i++) { - if (VIR_STRDUP(copy->props[i].name, orig->props[i].name) < 0) - goto error; + copy->props[i].name =3D g_strdup(orig->props[i].name); =20 copy->props[i].migratable =3D orig->props[i].migratable; copy->props[i].type =3D orig->props[i].type; @@ -3653,9 +3651,7 @@ qemuMonitorCPUModelInfoCopy(const qemuMonitorCPUModel= Info *orig) break; =20 case QEMU_MONITOR_CPU_PROPERTY_STRING: - if (VIR_STRDUP(copy->props[i].value.string, - orig->props[i].value.string) < 0) - goto error; + copy->props[i].value.string =3D g_strdup(orig->props[i].value.= string); break; =20 case QEMU_MONITOR_CPU_PROPERTY_NUMBER: diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 602a0380d7..58f84f1b96 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -823,8 +823,7 @@ qemuMonitorJSONGuestPanicExtractInfoS390(virJSONValuePt= r data) ret->data.s390.psw_mask =3D psw_mask; ret->data.s390.psw_addr =3D psw_addr; =20 - if (VIR_STRDUP(ret->data.s390.reason, reason) < 0) - goto error; + ret->data.s390.reason =3D g_strdup(reason); =20 return ret; =20 @@ -1586,8 +1585,7 @@ qemuMonitorJSONHumanCommand(qemuMonitorPtr mon, const char *data; =20 data =3D virJSONValueGetString(obj); - if (VIR_STRDUP(*reply_str, NULLSTR_EMPTY(data)) < 0) - goto cleanup; + *reply_str =3D g_strdup(NULLSTR_EMPTY(data)); } =20 ret =3D 0; @@ -1932,8 +1930,7 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr data, cpus[i].qemu_id =3D cpuid; cpus[i].tid =3D thread; cpus[i].halted =3D halted; - if (VIR_STRDUP(cpus[i].qom_path, qom_path) < 0) - goto cleanup; + cpus[i].qom_path =3D g_strdup(qom_path); =20 /* process optional architecture-specific data */ if (STREQ_NULLABLE(arch, "s390") || STREQ_NULLABLE(arch, "s390x")) @@ -2427,9 +2424,8 @@ qemuMonitorJSONBlockInfoAdd(virHashTablePtr table, *tmp =3D *info; tmp->nodename =3D NULL; =20 - if (info->nodename && - VIR_STRDUP(tmp->nodename, info->nodename) < 0) - goto cleanup; + if (info->nodename) + tmp->nodename =3D g_strdup(info->nodename); =20 if (virHashAddEntry(table, entryname, tmp) < 0) goto cleanup; @@ -3384,8 +3380,8 @@ qemuMonitorJSONGetMigrationStatsReply(virJSONValuePtr= reply, case QEMU_MONITOR_MIGRATION_STATUS_ERROR: if (error) { tmp =3D virJSONValueObjectGetString(ret, "error-desc"); - if (tmp && VIR_STRDUP(*error, tmp) < 0) - return -1; + if (tmp) + *error =3D g_strdup(tmp); } break; =20 @@ -3921,8 +3917,7 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValuePtr msg, "in query-rx-filter response")); goto cleanup; } - if (VIR_STRDUP(fil->name, tmp) < 0) - goto cleanup; + fil->name =3D g_strdup(tmp); if ((!(tmp =3D virJSONValueObjectGetString(entry, "main-mac"))) || virMacAddrParse(tmp, &fil->mac) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -4151,9 +4146,8 @@ qemuMonitorJSONExtractChardevInfo(virJSONValuePtr rep= ly, if (VIR_ALLOC(entry) < 0) goto cleanup; =20 - if (STRPREFIX(type, "pty:") && - VIR_STRDUP(entry->ptyPath, type + strlen("pty:")) < 0) - goto cleanup; + if (STRPREFIX(type, "pty:")) + entry->ptyPath =3D g_strdup(type + strlen("pty:")); =20 if (virJSONValueObjectGetBoolean(chardev, "frontend-open", &connec= ted) =3D=3D 0) { if (connected) @@ -4544,8 +4538,7 @@ qemuMonitorJSONDiskNameLookupOne(virJSONValuePtr imag= e, return qemuMonitorJSONDiskNameLookupOne(backing, top->backingStore, target); } - if (VIR_STRDUP(ret, virJSONValueObjectGetString(image, "filename")) < = 0) - return NULL; + ret =3D g_strdup(virJSONValueObjectGetString(image, "filename")); /* Sanity check - the name qemu gave us should resolve to the same file tracked by our target description. */ if (virStorageSourceIsLocalStorage(target) && @@ -5196,9 +5189,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io= _throttle, GET_THROTTLE_STATS_OPTIONAL("iops_wr_max", write_iops_sec_max); GET_THROTTLE_STATS_OPTIONAL("iops_size", size_iops_sec); =20 - if (VIR_STRDUP(reply->group_name, - virJSONValueObjectGetString(inserted, "group")) < 0) - goto cleanup; + reply->group_name =3D g_strdup(virJSONValueObjectGetString(inserte= d, "group")); =20 GET_THROTTLE_STATS_OPTIONAL("bps_max_length", total_bytes_sec_max_= length); GET_THROTTLE_STATS_OPTIONAL("bps_rd_max_length", read_bytes_sec_ma= x_length); @@ -5418,8 +5409,7 @@ int qemuMonitorJSONGetVersion(qemuMonitorPtr mon, _("query-version reply was missing 'package' ve= rsion")); goto cleanup; } - if (VIR_STRDUP(*package, tmp) < 0) - goto cleanup; + *package =3D g_strdup(tmp); } =20 ret =3D 0; @@ -5476,8 +5466,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, goto cleanup; } =20 - if (VIR_STRDUP(info->name, tmp) < 0) - goto cleanup; + info->name =3D g_strdup(tmp); =20 if (virJSONValueObjectHasKey(child, "is-default") && virJSONValueObjectGetBoolean(child, "is-default", &info->isDef= ault) < 0) { @@ -5492,8 +5481,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, _("query-machines reply has malformed 'alia= s' data")); goto cleanup; } - if (VIR_STRDUP(info->alias, tmp) < 0) - goto cleanup; + info->alias =3D g_strdup(tmp); } if (virJSONValueObjectHasKey(child, "cpu-max") && virJSONValueObjectGetNumberUint(child, "cpu-max", &info->maxCp= us) < 0) { @@ -5576,8 +5564,7 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, goto cleanup; } =20 - if (VIR_STRDUP(cpu->name, tmp) < 0) - goto cleanup; + cpu->name =3D g_strdup(tmp); =20 if (virJSONValueObjectHasKey(child, "unavailable-features")) { virJSONValuePtr blockers; @@ -5614,8 +5601,7 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, goto cleanup; } =20 - if (VIR_STRDUP(cpu->blockers[j], virJSONValueGetString(blo= cker)) < 0) - goto cleanup; + cpu->blockers[j] =3D g_strdup(virJSONValueGetString(blocke= r)); } } } @@ -5653,8 +5639,7 @@ qemuMonitorJSONParseCPUModelProperty(const char *key, =20 switch ((virJSONType)virJSONValueGetType(value)) { case VIR_JSON_TYPE_STRING: - if (VIR_STRDUP(prop->value.string, virJSONValueGetString(value)) <= 0) - return -1; + prop->value.string =3D g_strdup(virJSONValueGetString(value)); prop->type =3D QEMU_MONITOR_CPU_PROPERTY_STRING; break; =20 @@ -5677,8 +5662,7 @@ qemuMonitorJSONParseCPUModelProperty(const char *key, } =20 machine_model->nprops++; - if (VIR_STRDUP(prop->name, key) < 0) - return -1; + prop->name =3D g_strdup(key); =20 return 0; } @@ -5776,8 +5760,7 @@ qemuMonitorJSONParseCPUModel(const char *cpu_name, if (VIR_ALLOC(machine_model) < 0) goto cleanup; =20 - if (VIR_STRDUP(machine_model->name, cpu_name) < 0) - goto cleanup; + machine_model->name =3D g_strdup(cpu_name); =20 if (cpu_props) { size_t nprops =3D virJSONValueObjectKeysNumber(cpu_props); @@ -6001,8 +5984,7 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, goto cleanup; } =20 - if (VIR_STRDUP(commandlist[i], tmp) < 0) - goto cleanup; + commandlist[i] =3D g_strdup(tmp); } =20 ret =3D n; @@ -6062,8 +6044,7 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, goto cleanup; } =20 - if (VIR_STRDUP(eventlist[i], tmp) < 0) - goto cleanup; + eventlist[i] =3D g_strdup(tmp); } =20 ret =3D n; @@ -6179,8 +6160,7 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMon= itorPtr mon, goto cleanup; } =20 - if (VIR_STRDUP(paramlist[i], tmp) < 0) - goto cleanup; + paramlist[i] =3D g_strdup(tmp); } =20 ret =3D n; @@ -6283,8 +6263,7 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, goto cleanup; } =20 - if (VIR_STRDUP(typelist[i], tmp) < 0) - goto cleanup; + typelist[i] =3D g_strdup(tmp); } =20 ret =3D n; @@ -6347,8 +6326,7 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr = mon, goto cleanup; } =20 - if (VIR_STRDUP(info->name, tmp) < 0) - goto cleanup; + info->name =3D g_strdup(tmp); =20 if (virJSONValueObjectHasKey(child, "type")) { if (!(tmp =3D virJSONValueObjectGetString(child, "type"))) { @@ -6356,8 +6334,7 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr = mon, _("qom-list reply has malformed 'type' data= ")); goto cleanup; } - if (VIR_STRDUP(info->type, tmp) < 0) - goto cleanup; + info->type =3D g_strdup(tmp); } } =20 @@ -6435,8 +6412,8 @@ int qemuMonitorJSONGetObjectProperty(qemuMonitorPtr m= on, break; case QEMU_MONITOR_OBJECT_PROPERTY_STRING: tmp =3D virJSONValueGetString(data); - if (tmp && VIR_STRDUP(prop->val.str, tmp) < 0) - goto cleanup; + if (tmp) + prop->val.str =3D g_strdup(tmp); if (tmp) ret =3D 0; break; @@ -6505,8 +6482,7 @@ qemuMonitorJSONGetStringListProperty(qemuMonitorPtr m= on, return -1; } =20 - if (VIR_STRDUP(list[i], virJSONValueGetString(item)) < 0) - return -1; + list[i] =3D g_strdup(virJSONValueGetString(item)); } =20 *strList =3D g_steal_pointer(&list); @@ -6617,8 +6593,7 @@ qemuMonitorJSONParsePropsList(virJSONValuePtr cmd, goto cleanup; } =20 - if (VIR_STRDUP(proplist[count++], tmp) < 0) - goto cleanup; + proplist[count++] =3D g_strdup(tmp); } =20 ret =3D count; @@ -6780,8 +6755,7 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPt= r mon, goto cleanup; } =20 - if (VIR_STRDUP(list[i], name) < 1) - goto cleanup; + list[i] =3D g_strdup(name); } =20 ret =3D n; @@ -7014,11 +6988,9 @@ qemuMonitorJSONGetSEVCapabilities(qemuMonitorPtr mon, if (VIR_ALLOC(capability) < 0) goto cleanup; =20 - if (VIR_STRDUP(capability->pdh, pdh) < 0) - goto cleanup; + capability->pdh =3D g_strdup(pdh); =20 - if (VIR_STRDUP(capability->cert_chain, cert_chain) < 0) - goto cleanup; + capability->cert_chain =3D g_strdup(cert_chain); =20 capability->cbitpos =3D cbitpos; capability->reduced_phys_bits =3D reduced_phys_bits; @@ -7224,8 +7196,7 @@ qemuMonitorJSONGetStringArray(qemuMonitorPtr mon, con= st char *qmpCmd, goto cleanup; } =20 - if (VIR_STRDUP(list[i], tmp) < 0) - goto cleanup; + list[i] =3D g_strdup(tmp); } =20 ret =3D n; @@ -7458,8 +7429,7 @@ qemuMonitorJSONAttachCharDev(qemuMonitorPtr mon, goto cleanup; } =20 - if (VIR_STRDUP(chr->data.file.path, path) < 0) - goto cleanup; + chr->data.file.path =3D g_strdup(path); } =20 ret =3D 0; @@ -8465,8 +8435,7 @@ qemuMonitorJSONProcessHotpluggableCpusReply(virJSONVa= luePtr vcpu, return -1; } =20 - if (VIR_STRDUP(entry->type, tmp) < 0) - return -1; + entry->type =3D g_strdup(tmp); =20 if (virJSONValueObjectGetNumberUint(vcpu, "vcpus-count", &entry->vcpus= ) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -8503,14 +8472,11 @@ qemuMonitorJSONProcessHotpluggableCpusReply(virJSON= ValuePtr vcpu, =20 /* qom path is not present unless the vCPU is online */ if ((tmp =3D virJSONValueObjectGetString(vcpu, "qom-path"))) { - if (VIR_STRDUP(entry->qom_path, tmp) < 0) - return -1; + entry->qom_path =3D g_strdup(tmp); =20 /* alias is the part after last slash having a "vcpu" prefix */ - if ((tmp =3D strrchr(tmp, '/')) && STRPREFIX(tmp + 1, "vcpu")) { - if (VIR_STRDUP(entry->alias, tmp + 1) < 0) - return -1; - } + if ((tmp =3D strrchr(tmp, '/')) && STRPREFIX(tmp + 1, "vcpu")) + entry->alias =3D g_strdup(tmp + 1); } =20 return 0; @@ -8921,8 +8887,7 @@ qemuMonitorJSONGetSEVMeasurement(qemuMonitorPtr mon) if (!(tmp =3D virJSONValueObjectGetString(data, "data"))) goto cleanup; =20 - if (VIR_STRDUP(measurement, tmp) < 0) - goto cleanup; + measurement =3D g_strdup(tmp); =20 cleanup: virJSONValueFree(cmd); @@ -9309,9 +9274,8 @@ qemuMonitorJSONGetJobInfoOne(virJSONValuePtr data) =20 job->status =3D tmp; =20 - if (VIR_STRDUP(job->id, id) < 0 || - VIR_STRDUP(job->error, errmsg) < 0) - return NULL; + job->id =3D g_strdup(id); + job->error =3D g_strdup(errmsg); =20 ret =3D g_steal_pointer(&job); return ret; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 843e852591..7e0dc26658 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -967,8 +967,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon G_GNUC_UNU= SED, goto cleanup; =20 processEvent->eventType =3D QEMU_PROCESS_EVENT_BLOCK_JOB; - if (VIR_STRDUP(data, diskAlias) < 0) - goto cleanup; + data =3D g_strdup(diskAlias); processEvent->data =3D data; processEvent->vm =3D virObjectRef(vm); processEvent->action =3D type; @@ -1076,16 +1075,14 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon G_GNUC= _UNUSED, if (VIR_ALLOC(localAddr) < 0) goto error; localAddr->family =3D localFamily; - if (VIR_STRDUP(localAddr->service, localService) < 0 || - VIR_STRDUP(localAddr->node, localNode) < 0) - goto error; + localAddr->service =3D g_strdup(localService); + localAddr->node =3D g_strdup(localNode); =20 if (VIR_ALLOC(remoteAddr) < 0) goto error; remoteAddr->family =3D remoteFamily; - if (VIR_STRDUP(remoteAddr->service, remoteService) < 0 || - VIR_STRDUP(remoteAddr->node, remoteNode) < 0) - goto error; + remoteAddr->service =3D g_strdup(remoteService); + remoteAddr->node =3D g_strdup(remoteNode); =20 if (VIR_ALLOC(subject) < 0) goto error; @@ -1093,17 +1090,15 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon G_GNUC= _UNUSED, if (VIR_REALLOC_N(subject->identities, subject->nidentity+1) < 0) goto error; subject->nidentity++; - if (VIR_STRDUP(subject->identities[subject->nidentity-1].type, "x5= 09dname") < 0 || - VIR_STRDUP(subject->identities[subject->nidentity-1].name, x50= 9dname) < 0) - goto error; + subject->identities[subject->nidentity - 1].type =3D g_strdup("x50= 9dname"); + subject->identities[subject->nidentity - 1].name =3D g_strdup(x509= dname); } if (saslUsername) { if (VIR_REALLOC_N(subject->identities, subject->nidentity+1) < 0) goto error; subject->nidentity++; - if (VIR_STRDUP(subject->identities[subject->nidentity-1].type, "sa= slUsername") < 0 || - VIR_STRDUP(subject->identities[subject->nidentity-1].name, sas= lUsername) < 0) - goto error; + subject->identities[subject->nidentity - 1].type =3D g_strdup("sas= lUsername"); + subject->identities[subject->nidentity - 1].name =3D g_strdup(sasl= Username); } =20 virObjectLock(vm); @@ -1385,8 +1380,7 @@ qemuProcessHandleDeviceDeleted(qemuMonitorPtr mon G_G= NUC_UNUSED, goto error; =20 processEvent->eventType =3D QEMU_PROCESS_EVENT_DEVICE_DELETED; - if (VIR_STRDUP(data, devAlias) < 0) - goto error; + data =3D g_strdup(devAlias); processEvent->data =3D data; processEvent->vm =3D virObjectRef(vm); =20 @@ -1559,8 +1553,7 @@ qemuProcessHandleNicRxFilterChanged(qemuMonitorPtr mo= n G_GNUC_UNUSED, goto error; =20 processEvent->eventType =3D QEMU_PROCESS_EVENT_NIC_RX_FILTER_CHANGED; - if (VIR_STRDUP(data, devAlias) < 0) - goto error; + data =3D g_strdup(devAlias); processEvent->data =3D data; processEvent->vm =3D virObjectRef(vm); =20 @@ -1598,8 +1591,7 @@ qemuProcessHandleSerialChanged(qemuMonitorPtr mon G_G= NUC_UNUSED, goto error; =20 processEvent->eventType =3D QEMU_PROCESS_EVENT_SERIAL_CHANGED; - if (VIR_STRDUP(data, devAlias) < 0) - goto error; + data =3D g_strdup(devAlias); processEvent->data =3D data; processEvent->action =3D connected; processEvent->vm =3D virObjectRef(vm); @@ -1839,10 +1831,11 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitorPt= r mon G_GNUC_UNUSED, VIR_DEBUG("netdev=3D%s,gid_status=3D%d,subnet_prefix=3D0x%llx,interfac= e_id=3D0x%llx", netdev, gid_status, subnet_prefix, interface_id); =20 - if (VIR_ALLOC(info) < 0 || - VIR_STRDUP(info->netdev, netdev) < 0) + if (VIR_ALLOC(info) < 0) goto cleanup; =20 + info->netdev =3D g_strdup(netdev); + info->gid_status =3D gid_status; info->subnet_prefix =3D subnet_prefix; info->interface_id =3D interface_id; @@ -2133,8 +2126,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, } =20 VIR_FREE(chr->source->data.file.path); - if (VIR_STRDUP(chr->source->data.file.path, entry->ptyPath) < = 0) - goto cleanup; + chr->source->data.file.path =3D g_strdup(entry->ptyPath); } } =20 @@ -4586,8 +4578,7 @@ qemuProcessIncomingDefNew(virQEMUCapsPtr qemuCaps, if (VIR_ALLOC(inc) < 0) return NULL; =20 - if (VIR_STRDUP(inc->address, listenAddress) < 0) - goto error; + inc->address =3D g_strdup(listenAddress); =20 inc->launchURI =3D qemuMigrationDstGetURI(migrateFrom, fd); if (!inc->launchURI) @@ -4595,8 +4586,7 @@ qemuProcessIncomingDefNew(virQEMUCapsPtr qemuCaps, =20 if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_INCOMING_DEFER)) { inc->deferredURI =3D inc->launchURI; - if (VIR_STRDUP(inc->launchURI, "defer") < 0) - goto error; + inc->launchURI =3D g_strdup("defer"); } =20 inc->fd =3D fd; @@ -4865,8 +4855,7 @@ qemuProcessGraphicsSetupNetworkAddress(virDomainGraph= icsListenDefPtr glisten, =20 /* TODO: reject configuration without network specified for network li= sten */ if (!glisten->network) { - if (VIR_STRDUP(glisten->address, listenAddr) < 0) - return -1; + glisten->address =3D g_strdup(listenAddr); return 0; } =20 @@ -4933,8 +4922,7 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr drive= r, glisten->fromConfig =3D true; glisten->type =3D VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCK= ET; } else if (listenAddr) { - if (VIR_STRDUP(glisten->address, listenAddr) < 0) - goto cleanup; + glisten->address =3D g_strdup(listenAddr); glisten->fromConfig =3D true; } } @@ -8477,9 +8465,8 @@ qemuProcessQMPNew(const char *binary, if (VIR_ALLOC(proc) < 0) goto cleanup; =20 - if (VIR_STRDUP(proc->binary, binary) < 0 || - VIR_STRDUP(proc->libDir, libDir) < 0) - goto cleanup; + proc->binary =3D g_strdup(binary); + proc->libDir =3D g_strdup(libDir); =20 proc->runUid =3D runUid; proc->runGid =3D runGid; diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c index dfef6f20a3..789d29ce43 100644 --- a/src/qemu/qemu_vhost_user.c +++ b/src/qemu/qemu_vhost_user.c @@ -172,8 +172,7 @@ qemuVhostUserBinaryParse(const char *path, VIR_DEBUG("vhost-user description path '%s' binary : %s", path, binary); =20 - if (VIR_STRDUP(vu->binary, binary) < 0) - return -1; + vu->binary =3D g_strdup(binary); =20 return 0; } @@ -389,8 +388,7 @@ qemuVhostUserFillDomainGPU(virQEMUDriverPtr driver, goto end; =20 VIR_FREE(video->driver->vhost_user_binary); - if (VIR_STRDUP(video->driver->vhost_user_binary, vu->binary) < 0) - goto end; + video->driver->vhost_user_binary =3D g_strdup(vu->binary); =20 break; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list