From nobody Fri Apr 26 11:40:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1578594852; cv=none; d=zohomail.com; s=zohoarc; b=GaI43IiR3QfkooycNWF1dPLFDNL02yQcuL81ErwauLnRfcl1D4uuo7WTIECYzjF35MLhx4b1yulwI1sqnriwARvGZXqhoWEASrIxadc3/rW650+sq/f+sT3rrxb7KkREFnzVbkKcke0jxzGKOnB+mi96omH2AcHwIXNcUxwNzFw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578594852; 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=8N0/SWAnCtmUOLRnXrYMVFpC/uMEnp1GHRD/ox8HBNM=; b=e8RIqLQ920BnKWVsIdZGLk9GwBasT43e9iUEdR47dV/tzrLwMfMiyTaPQPL6gpLnuAEOrDk/CWc+nss4kJgPWFhUHDwqnmIE04EMu4vvXVwVX9+1DUcDgdpZe5wNaTa+velmvxaWfu2Go0SUrALkzqN5zKIn/0cmIFD62GetBwc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail 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 15785948527881.2659673793384627; Thu, 9 Jan 2020 10:34:12 -0800 (PST) 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-218-0_JTjsDbNGCvkmfnmVe0JQ-1; Thu, 09 Jan 2020 13:34:09 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A9CA618A6ECA; Thu, 9 Jan 2020 18:34:04 +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 81BF41A8E9; Thu, 9 Jan 2020 18:34:04 +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 32B8A503C8; Thu, 9 Jan 2020 18:34:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 009IY2OX019801 for ; Thu, 9 Jan 2020 13:34:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5A2F113BBA8; Thu, 9 Jan 2020 18:34:02 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 54C6813BBB0 for ; Thu, 9 Jan 2020 18:33:59 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2EB0C10192A5 for ; Thu, 9 Jan 2020 18:33:59 +0000 (UTC) Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-139-aqgi0CxqPFGqyHsLs7IREw-1; Thu, 09 Jan 2020 13:33:57 -0500 Received: by mail-qt1-f195.google.com with SMTP id j5so6678209qtq.9 for ; Thu, 09 Jan 2020 10:33:57 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:541e:7a5e:37ad:989b:4530]) by smtp.gmail.com with ESMTPSA id g52sm3902267qta.58.2020.01.09.10.33.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:33:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578594851; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=8N0/SWAnCtmUOLRnXrYMVFpC/uMEnp1GHRD/ox8HBNM=; b=gZZvtCNR9Wge6Zb8ozWPy8OtebIb31/d8RA73zNI465K2S109H1XZ9qbhhQ0g4T4fSldKg 6lYHo6uR+R362bxddNyLziaWCRx+34Ql2ts1lRTx6chr504u45l8qdd+yodXVxBhw7ojsw 6wTyp320j16ZeQthzxPED1Xp6IlCRh0= 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=jf046apT131AUS69Jpi9NBgf7evLbpXafW5POWhnQII=; b=UJ7RFsgzj2i2j9d5l9sLsh9p7WXKmsowWpAuxKSlktoWzvWE4zHcmCtsWjQ4+Ym/kn yxYrM7phF7n0wE9LLX58kYuFOuaIjVXqYDYN5XEqd+VTbTDmqMMNcEEoKanxpvuwHZRi zCYy4uMKhtEQCt/uLDWfHajDjg0kdLdNxTDS0vRAi5LyGhODItEZ+29SsXUkkfLQG76T 7Ej/w6AARk8djgS0A+9JU16UL59x9hzOXAukY8/kwfFBPHu5AOxBkyKGFantduu0ocqm YBxGYbxWWL2M0NJAVQyXvaoEZQh0WNrSa2tVGJK0atlAFtRMe1EkpXCrmXWKV+7jdRYu o/XQ== X-Gm-Message-State: APjAAAWi49J5pIlnUedl6L7OZzAWPWlqD7BunfsqFHYUuFzRFZlP14BR FUg2hXE+pqxN4QlJ6GRt7Sl3AJ43 X-Google-Smtp-Source: APXvYqxQRuZl35iz7DiqUp4tFsnr3BtU1N3k3jWQHHoxS+2F8BIBDP2C2D04Yc+M9ByDycQ6Ig+N2g== X-Received: by 2002:ac8:787:: with SMTP id l7mr8380640qth.99.1578594836785; Thu, 09 Jan 2020 10:33:56 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 15:33:41 -0300 Message-Id: <20200109183348.1362138-2-danielhb413@gmail.com> In-Reply-To: <20200109183348.1362138-1-danielhb413@gmail.com> References: <20200109183348.1362138-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: aqgi0CxqPFGqyHsLs7IREw-1 X-MC-Unique: 0_JTjsDbNGCvkmfnmVe0JQ-1 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 009IY2OX019801 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 1/8] conf/domain_addr.c: use g_autofree in strings 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.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Use g_autofree in strings when possible to spare a VIR_FREE() call. Unneeded 'cleanup' labels will be taken care of in the next patch. The 'str' string in virDomainVirtioSerialAddrReserve() was never used by the logic, only being used in cleanup by VIR_FREE(). Let's remove it. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik and pushed. Sorry=20 --- src/conf/domain_addr.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index ef7ee80e6a..ee4dcf1d3b 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -830,7 +830,7 @@ virDomainPCIAddressReserveAddrInternal(virDomainPCIAddr= essSetPtr addrs, bool fromConfig) { int ret =3D -1; - char *addrStr =3D NULL; + g_autofree char *addrStr =3D NULL; virDomainPCIAddressBusPtr bus; virErrorNumber errType =3D (fromConfig ? VIR_ERR_XML_ERROR : VIR_ERR_INTERNAL_ERROR= ); @@ -891,7 +891,6 @@ virDomainPCIAddressReserveAddrInternal(virDomainPCIAddr= essSetPtr addrs, =20 ret =3D 0; cleanup: - VIR_FREE(addrStr); return ret; } =20 @@ -912,7 +911,7 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr= addrs, virDomainPCIConnectFlags flags) { int ret =3D -1; - char *addrStr =3D NULL; + g_autofree char *addrStr =3D NULL; =20 /* if flags is 0, the particular model of this device on this * machinetype doesn't need a PCI address, so we're done. @@ -955,7 +954,6 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr= addrs, ret =3D 0; =20 cleanup: - VIR_FREE(addrStr); return ret; } =20 @@ -1105,7 +1103,7 @@ virDomainPCIAddressFindUnusedFunctionOnBus(virDomainP= CIAddressBusPtr bus, bool *found) { int ret =3D -1; - char *addrStr =3D NULL; + g_autofree char *addrStr =3D NULL; =20 *found =3D false; =20 @@ -1159,7 +1157,6 @@ virDomainPCIAddressFindUnusedFunctionOnBus(virDomainP= CIAddressBusPtr bus, ret =3D 0; =20 cleanup: - VIR_FREE(addrStr); return ret; } =20 @@ -1414,7 +1411,7 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev, bool autoassign) { int ret =3D -1; - char *addr =3D NULL; + g_autofree char *addr =3D NULL; =20 if (dev->type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) return 0; @@ -1457,7 +1454,6 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev, ret =3D 0; =20 cleanup: - VIR_FREE(addr); return ret; } =20 @@ -1687,7 +1683,6 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr def = G_GNUC_UNUSED, void *data) { virDomainVirtioSerialAddrSetPtr addrs =3D data; - char *str =3D NULL; int ret =3D -1; virBitmapPtr map =3D NULL; bool b; @@ -1729,7 +1724,6 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr def = G_GNUC_UNUSED, ret =3D 0; =20 cleanup: - VIR_FREE(str); return ret; } =20 @@ -2208,7 +2202,7 @@ virDomainUSBAddressSetAddHub(virDomainUSBAddressSetPt= r addrs, virDomainUSBAddressHubPtr targetHub =3D NULL, newHub =3D NULL; int ret =3D -1; int targetPort; - char *portStr =3D NULL; + g_autofree char *portStr =3D NULL; =20 if (hub->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -2242,7 +2236,6 @@ virDomainUSBAddressSetAddHub(virDomainUSBAddressSetPt= r addrs, ret =3D 0; cleanup: virDomainUSBAddressHubFree(newHub); - VIR_FREE(portStr); return ret; } =20 @@ -2349,7 +2342,7 @@ virDomainUSBAddressAssignFromBus(virDomainUSBAddressS= etPtr addrs, { unsigned int portpath[VIR_DOMAIN_DEVICE_USB_MAX_PORT_DEPTH] =3D { 0 }; virDomainUSBAddressHubPtr hub =3D addrs->buses[bus]; - char *portStr =3D NULL; + g_autofree char *portStr =3D NULL; int ret =3D -1; =20 if (!hub) @@ -2372,7 +2365,6 @@ virDomainUSBAddressAssignFromBus(virDomainUSBAddressS= etPtr addrs, =20 ret =3D 0; cleanup: - VIR_FREE(portStr); return ret; } =20 @@ -2428,7 +2420,7 @@ virDomainUSBAddressReserve(virDomainDeviceInfoPtr inf= o, { virDomainUSBAddressSetPtr addrs =3D data; virDomainUSBAddressHubPtr targetHub =3D NULL; - char *portStr =3D NULL; + g_autofree char *portStr =3D NULL; int ret =3D -1; int targetPort; =20 @@ -2459,7 +2451,6 @@ virDomainUSBAddressReserve(virDomainDeviceInfoPtr inf= o, ret =3D 0; =20 cleanup: - VIR_FREE(portStr); return ret; } =20 @@ -2490,7 +2481,7 @@ virDomainUSBAddressRelease(virDomainUSBAddressSetPtr = addrs, virDomainDeviceInfoPtr info) { virDomainUSBAddressHubPtr targetHub =3D NULL; - char *portStr =3D NULL; + g_autofree char *portStr =3D NULL; int targetPort; int ret =3D -1; =20 @@ -2510,6 +2501,5 @@ virDomainUSBAddressRelease(virDomainUSBAddressSetPtr = addrs, ret =3D 0; =20 cleanup: - VIR_FREE(portStr); return ret; } --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 26 11:40:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1578594865; cv=none; d=zohomail.com; s=zohoarc; b=bvMuKdr5cxAwDv4OA1lKnJ8wtjkfT79+czXO5OlSIJ82fl4Gk7BXv48TPpJCSXw53IoTD5Zp43FWOJQzrzcdOISn+4UT8Ol5axpkXPpwbAv1f2ORZpPXxtP1FS4AZ+pLio67bfbSTNia1qWZPaE61RbNpQaPj7ramEIGpaevYSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578594865; 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=BkA81KShkU/wnKmzZFRY5mGjU0iYAlteCYWWyxKOHx4=; b=KYP8U88MQVdbjm+q4uRHEwL6rc8NCTQ+1ttrjfeeuexZj4M5K44HEjbhceSjoRsswjAPUW+ZZN73SEtRIW3l5GkSiQTu8ZGftXUkse/T5HlL0d3cu5LNix8POSuRSYS+f19VpZNNvAtT3bAw4jZ8MvZz2eibFfPvoeJYgNIw/Q8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 157859486518574.8026866125274; Thu, 9 Jan 2020 10:34:25 -0800 (PST) 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-366-WYU_r474MXeFQ8lPdzsLEw-1; Thu, 09 Jan 2020 13:34:21 -0500 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 BBED3107ACC7; Thu, 9 Jan 2020 18:34:15 +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 972605D9C9; Thu, 9 Jan 2020 18:34:15 +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 5D22918089D0; Thu, 9 Jan 2020 18:34:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 009IY9fJ019859 for ; Thu, 9 Jan 2020 13:34:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id 442351059162; Thu, 9 Jan 2020 18:34:09 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3E03B1069F5E for ; Thu, 9 Jan 2020 18:34:06 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B93C48E3898 for ; Thu, 9 Jan 2020 18:34:06 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-39-bG68ucV5PLaDojyOz10Vaw-1; Thu, 09 Jan 2020 13:33:59 -0500 Received: by mail-qt1-f193.google.com with SMTP id k40so6684332qtk.8 for ; Thu, 09 Jan 2020 10:33:59 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:541e:7a5e:37ad:989b:4530]) by smtp.gmail.com with ESMTPSA id g52sm3902267qta.58.2020.01.09.10.33.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:33:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578594864; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=BkA81KShkU/wnKmzZFRY5mGjU0iYAlteCYWWyxKOHx4=; b=KOxQ1UyNIiAFkN52+mMteRpTXpUqxfYj/yNMDcidYfeHC43Zcjbd+zYEE0uCN+G+8CQ2+f 1fEud7YvW3EOWFi4lXJEFgdHzSm65eSUjvXUBbkrW3TBlR9/0EWT00D3HtpeL56/Sp0SEY 1s6m2AkGbOZ2MozzZ3yEwGLhz/G9CXg= 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=AU7StpGqAPIE6Oo+BkUdhBVMKr34y64rXlVF93JJBY0=; b=sNUmJ05yTYCWw/KCGMmgDPW537f9lXd3uGrOH//7s3ZyyoNRZ9QOSx9GGvsYStllBa I2CK2uF+L3StUkQX/gQFDm67p99lZli+wa7Bm7OetkeN2/yKLHAITziYtpG+z/9YTpnj pLWP6oOMZzePwu+/qlv4Zh3PF/yuH1YBiJW0u2Cjye2xOxBCGTWT8QZuPHLRfVj1m+vn RIGzHwEmKL+3cukR+q9b3rogVTW/RQShwwZR3X5RT2P4pDSX0w1ONURQuiGfhxNd/33I +GVxIbgk7pKsuHbSqE9RGObhqM1feh17P9tKf1yFlehzM3+oziCjSRhdCY5l9wScB9h1 IRoA== X-Gm-Message-State: APjAAAUI/t3/VBpad2AsM+tOSvZb4hs1IWzA37fSXPGdPV/VpeWFrYxr CG/T3Y+/WCidwd1A3jIrKlDOlZR/ X-Google-Smtp-Source: APXvYqyBm15Sx7wks+QyN/xRrHYopVaO6enKmgVd1Vy6U3Al6ATm7+NTcCat6/uzVGXR1GnkN6Sl3g== X-Received: by 2002:ac8:2c7d:: with SMTP id e58mr9294743qta.196.1578594838340; Thu, 09 Jan 2020 10:33:58 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 15:33:42 -0300 Message-Id: <20200109183348.1362138-3-danielhb413@gmail.com> In-Reply-To: <20200109183348.1362138-1-danielhb413@gmail.com> References: <20200109183348.1362138-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: bG68ucV5PLaDojyOz10Vaw-1 X-MC-Unique: WYU_r474MXeFQ8lPdzsLEw-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 009IY9fJ019859 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 2/8] conf/domain_addr.c: remove unneeded 'cleanup' labels 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-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Previous patch used 'g_autofree' to eliminate instances of VIR_FREE(), making some cleanup labels obsolete. This patch removes them. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik and pushed. Sorry=20 --- src/conf/domain_addr.c | 98 +++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 64 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index ee4dcf1d3b..0dd4b15225 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -829,30 +829,29 @@ virDomainPCIAddressReserveAddrInternal(virDomainPCIAd= dressSetPtr addrs, unsigned int isolationGroup, bool fromConfig) { - int ret =3D -1; g_autofree char *addrStr =3D NULL; virDomainPCIAddressBusPtr bus; virErrorNumber errType =3D (fromConfig ? VIR_ERR_XML_ERROR : VIR_ERR_INTERNAL_ERROR= ); =20 if (!(addrStr =3D virPCIDeviceAddressAsString(addr))) - goto cleanup; + return -1; =20 /* Add an extra bus if necessary */ if (addrs->dryRun && virDomainPCIAddressSetGrow(addrs, addr, flags) < = 0) - goto cleanup; + return -1; /* Check that the requested bus exists, is the correct type, and we * are asking for a valid slot */ if (!virDomainPCIAddressValidate(addrs, addr, addrStr, flags, fromConf= ig)) - goto cleanup; + return -1; =20 bus =3D &addrs->buses[addr->bus]; =20 if (bus->slot[addr->slot].functions & (1 << addr->function)) { virReportError(errType, _("Attempted double use of PCI Address %s"), addrSt= r); - goto cleanup; + return -1; } =20 /* if this is the first function to be reserved on this slot, and @@ -889,9 +888,7 @@ virDomainPCIAddressReserveAddrInternal(virDomainPCIAddr= essSetPtr addrs, VIR_DEBUG("Reserving PCI address %s (aggregate=3D'%s')", addrStr, bus->slot[addr->slot].aggregate ? "true" : "false"); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -910,7 +907,6 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr= addrs, virDomainDeviceInfoPtr dev, virDomainPCIConnectFlags flags) { - int ret =3D -1; g_autofree char *addrStr =3D NULL; =20 /* if flags is 0, the particular model of this device on this @@ -920,7 +916,7 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr= addrs, return 0; =20 if (!(addrStr =3D virPCIDeviceAddressAsString(&dev->addr.pci))) - goto cleanup; + return -1; =20 if (virDeviceInfoPCIAddressIsPresent(dev)) { /* We do not support hotplug multi-function PCI device now, so we = should @@ -930,31 +926,28 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetP= tr addrs, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Only PCI device addresses with function=3D0" " are supported")); - goto cleanup; + return -1; } =20 if (!virDomainPCIAddressValidate(addrs, &dev->addr.pci, addrStr, flags, true)) - goto cleanup; + return -1; =20 if (virDomainPCIAddressReserveAddrInternal(addrs, &dev->addr.pci, flags, dev->isolationGr= oup, true) < 0) { - goto cleanup; + return -1; } } else { if (virDomainPCIAddressReserveNextAddr(addrs, dev, flags, -1) < 0) - goto cleanup; + return -1; } =20 dev->addr.pci.extFlags =3D dev->pciAddrExtFlags; if (virDomainPCIAddressExtensionEnsureAddr(addrs, &dev->addr.pci) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -1102,13 +1095,12 @@ virDomainPCIAddressFindUnusedFunctionOnBus(virDomai= nPCIAddressBusPtr bus, virDomainPCIConnectFlags flags, bool *found) { - int ret =3D -1; g_autofree char *addrStr =3D NULL; =20 *found =3D false; =20 if (!(addrStr =3D virPCIDeviceAddressAsString(searchAddr))) - goto cleanup; + return -1; =20 if (!virDomainPCIAddressFlagsCompatible(searchAddr, addrStr, bus->flag= s, flags, false, false)) { @@ -1154,10 +1146,7 @@ virDomainPCIAddressFindUnusedFunctionOnBus(virDomain= PCIAddressBusPtr bus, } } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -1410,7 +1399,6 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev, virDomainCCWAddressSetPtr addrs, bool autoassign) { - int ret =3D -1; g_autofree char *addr =3D NULL; =20 if (dev->type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) @@ -1418,27 +1406,27 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr de= v, =20 if (!autoassign && dev->addr.ccw.assigned) { if (!(addr =3D virDomainCCWAddressAsString(&dev->addr.ccw))) - goto cleanup; + return -1; =20 if (virHashLookup(addrs->defined, addr)) { virReportError(VIR_ERR_XML_ERROR, _("The CCW devno '%s' is in use already "), addr); - goto cleanup; + return -1; } } else if (autoassign && !dev->addr.ccw.assigned) { if (!(addr =3D virDomainCCWAddressAsString(&addrs->next))) - goto cleanup; + return -1; =20 while (virHashLookup(addrs->defined, addr)) { if (virDomainCCWAddressIncrement(&addrs->next) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("There are no more free CCW devnos.")); - goto cleanup; + return -1; } VIR_FREE(addr); if (!(addr =3D virDomainCCWAddressAsString(&addrs->next))) - goto cleanup; + return -1; } dev->addr.ccw =3D addrs->next; dev->addr.ccw.assigned =3D true; @@ -1447,14 +1435,11 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr de= v, } =20 if (virHashAddEntry(addrs->defined, addr, addr) < 0) - goto cleanup; + return -1; else addr =3D NULL; /* memory will be freed by hash table */ =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) @@ -1683,7 +1668,6 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr def = G_GNUC_UNUSED, void *data) { virDomainVirtioSerialAddrSetPtr addrs =3D data; - int ret =3D -1; virBitmapPtr map =3D NULL; bool b; ssize_t i; @@ -1699,7 +1683,7 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr def = G_GNUC_UNUSED, virReportError(VIR_ERR_XML_ERROR, _("virtio serial controller %u is missing"), info->addr.vioserial.controller); - goto cleanup; + return -1; } =20 map =3D addrs->controllers[i]->ports; @@ -1708,7 +1692,7 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr def = G_GNUC_UNUSED, _("virtio serial controller %u does not have port %= u"), info->addr.vioserial.controller, info->addr.vioserial.port); - goto cleanup; + return -1; } =20 if (b) { @@ -1716,15 +1700,12 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr de= f G_GNUC_UNUSED, _("virtio serial port %u on controller %u is alread= y occupied"), info->addr.vioserial.port, info->addr.vioserial.controller); - goto cleanup; + return -1; } =20 ignore_value(virBitmapSetBit(map, info->addr.vioserial.port)); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 /* virDomainVirtioSerialAddrSetCreateFromDomain @@ -2343,7 +2324,6 @@ virDomainUSBAddressAssignFromBus(virDomainUSBAddressS= etPtr addrs, unsigned int portpath[VIR_DOMAIN_DEVICE_USB_MAX_PORT_DEPTH] =3D { 0 }; virDomainUSBAddressHubPtr hub =3D addrs->buses[bus]; g_autofree char *portStr =3D NULL; - int ret =3D -1; =20 if (!hub) return -2; @@ -2353,7 +2333,7 @@ virDomainUSBAddressAssignFromBus(virDomainUSBAddressS= etPtr addrs, =20 /* we found a free port */ if (!(portStr =3D virDomainUSBAddressPortFormat(portpath))) - goto cleanup; + return -1; =20 info->type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB; info->addr.usb.bus =3D bus; @@ -2361,11 +2341,9 @@ virDomainUSBAddressAssignFromBus(virDomainUSBAddress= SetPtr addrs, VIR_DEBUG("Assigning USB addr bus=3D%u port=3D%s", info->addr.usb.bus, portStr); if (virDomainUSBAddressReserve(info, addrs) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -2421,7 +2399,6 @@ virDomainUSBAddressReserve(virDomainDeviceInfoPtr inf= o, virDomainUSBAddressSetPtr addrs =3D data; virDomainUSBAddressHubPtr targetHub =3D NULL; g_autofree char *portStr =3D NULL; - int ret =3D -1; int targetPort; =20 if (info->type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) @@ -2432,26 +2409,23 @@ virDomainUSBAddressReserve(virDomainDeviceInfoPtr i= nfo, =20 portStr =3D virDomainUSBAddressPortFormat(info->addr.usb.port); if (!portStr) - goto cleanup; + return -1; VIR_DEBUG("Reserving USB address bus=3D%u port=3D%s", info->addr.usb.b= us, portStr); =20 if (!(targetHub =3D virDomainUSBAddressFindPort(addrs, info, &targetPo= rt, portStr))) - goto cleanup; + return -1; =20 if (virBitmapIsBitSet(targetHub->portmap, targetPort)) { virReportError(VIR_ERR_XML_ERROR, _("Duplicate USB address bus %u port %s"), info->addr.usb.bus, portStr); - goto cleanup; + return -1; } =20 ignore_value(virBitmapSetBit(targetHub->portmap, targetPort)); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -2483,7 +2457,6 @@ virDomainUSBAddressRelease(virDomainUSBAddressSetPtr = addrs, virDomainUSBAddressHubPtr targetHub =3D NULL; g_autofree char *portStr =3D NULL; int targetPort; - int ret =3D -1; =20 if (!addrs || info->type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB || !virDomainUSBAddressPortIsValid(info->addr.usb.port)) @@ -2494,12 +2467,9 @@ virDomainUSBAddressRelease(virDomainUSBAddressSetPtr= addrs, =20 if (!(targetHub =3D virDomainUSBAddressFindPort(addrs, info, &targetPo= rt, portStr))) - goto cleanup; + return -1; =20 ignore_value(virBitmapClearBit(targetHub->portmap, targetPort)); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 26 11:40:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1578594861; cv=none; d=zohomail.com; s=zohoarc; b=YDOjiSxo1JCmVr264h7VFJkEtE/EL8KVSVyuz/3bHeuISBT1OoHuRUA6w86bStqTOQYPapP6cy3eXJmY6Od6JDpqzUsP/lRsNAAPCnxIb6qXmedg5QkXUVg7idtqYAvHz55cuFP5HXOwTF/B79uwfRs7Ys5ks4cje6XW7SAymHk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578594861; 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=C0zQVMy7jOOVd2bV5DRrIaYqHOVndHEvlsuwyxR6b8g=; b=iuZ7v9ZVtQvmePNdMeGphaA/9U1AqyPme1Y3itO7up/jLDLMj416zmb3Rqd3CIrF/UepsdVHyjZ8re0l2iRXG5ZzQ1mJCHnYDVeprSUunb/Yb78pmKYrMmYuGe4Y3QBE7m41LcttEYmEKiUC5A0LN3aYFg2eJd5doJvJgPKP18o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail 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 1578594861251704.9234610414396; Thu, 9 Jan 2020 10:34:21 -0800 (PST) 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-379-gP_2vnk2MWaZYZ_enTF1CA-1; Thu, 09 Jan 2020 13:34:18 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id B808F1050943; Thu, 9 Jan 2020 18:34:08 +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 8B0321000337; Thu, 9 Jan 2020 18:34:08 +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 D84B9503CB; Thu, 9 Jan 2020 18:34:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 009IY6IL019824 for ; Thu, 9 Jan 2020 13:34:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id E03422028DCB; Thu, 9 Jan 2020 18:34:05 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D8ED42026D67 for ; Thu, 9 Jan 2020 18:34:03 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EEB6F185A79C for ; Thu, 9 Jan 2020 18:34:02 +0000 (UTC) Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-71-0Wjb7PP-O9e8aioML0E91w-1; Thu, 09 Jan 2020 13:34:00 -0500 Received: by mail-qk1-f193.google.com with SMTP id j9so6974466qkk.1 for ; Thu, 09 Jan 2020 10:34:00 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:541e:7a5e:37ad:989b:4530]) by smtp.gmail.com with ESMTPSA id g52sm3902267qta.58.2020.01.09.10.33.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:33:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578594860; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=C0zQVMy7jOOVd2bV5DRrIaYqHOVndHEvlsuwyxR6b8g=; b=H9S6FQEySkQaJaPfAlCY3dfVWrEIkhotDybyp5pC+0KonaoLUbBD8jH5JdegYmNLJ9SuQM QNddFyK51Lox6DalmdZ9jW7Pg7RwprPCeaH3R/xYW1j30gF3B5nMA6hdgatu6q6Kocx1KI CCVTXhzt1z+JDtVZvAR09zZghvLF760= 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=J8O18wy7hKlyjvjP1gwA7d3EBS9wAS6Nj6BRSRNHg7U=; b=GstMRFC7EyEVty5V85UevlxaOmkxmoXV2Jvp0pJY2GtWUpCfZA3nQkWzT3PYEYCvZd Qjf0ZMJkYcYUxgWCwzKtN0xkX5I0I+03KXMledhliLB4DfpW5F34YmJQgveTw5m5xpd9 hdVDHorlF2n3gOJgWhA/awNfDo7x/vF0eQXkEm77HTR83vQSAtB4gjc72hXTJTnsDydb aFFQIuOKd73uAlHKvkq9SJ/c83T/LiyJGYFPMVzUeFhMIjJUGPkoseIZnyNilKpYBXCr bAYEZkfz0a9+DVlo6wyDJWVf03KIFVlZiGdXrWgIRdTFeJT5vOl9TXwGArLHZzO2a/1Q c8sw== X-Gm-Message-State: APjAAAVRfxh85DCFmfCGIMnWrClPpAwzMD638nqUcAL2/svcBp+gMlfV ZSGKOXLpvn5cRdNV4DNzyGWHSAr6 X-Google-Smtp-Source: APXvYqyXtLcjJDdC4w/q5eerf4Meo430RhYuN9kBqQPIsVLPEIFjWj5eeJ60JjfzvMDOUA6Ci4ytDQ== X-Received: by 2002:a37:7b43:: with SMTP id w64mr10782875qkc.203.1578594839777; Thu, 09 Jan 2020 10:33:59 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 15:33:43 -0300 Message-Id: <20200109183348.1362138-4-danielhb413@gmail.com> In-Reply-To: <20200109183348.1362138-1-danielhb413@gmail.com> References: <20200109183348.1362138-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: 0Wjb7PP-O9e8aioML0E91w-1 X-MC-Unique: gP_2vnk2MWaZYZ_enTF1CA-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 009IY6IL019824 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 3/8] qemu_domain.c: remove redundant virObjectUnref() 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.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The 'caps' variable in qemuDomainObjPrivateXMLParseAutomaticPlacement() is set to auto clean via g_autoptr(), but a 'virObjectUnref(caps)' is being executed in the 'cleanup' label. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik and pushed. Sorry=20 --- src/qemu/qemu_domain.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 24e84a5966..999e0db49e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3106,7 +3106,6 @@ qemuDomainObjPrivateXMLParseAutomaticPlacement(xmlXPa= thContextPtr ctxt, ret =3D 0; =20 cleanup: - virObjectUnref(caps); VIR_FREE(nodeset); VIR_FREE(cpuset); =20 --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 26 11:40:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1578594855; cv=none; d=zohomail.com; s=zohoarc; b=HXo1RLsUypEO8pCc8nKF1lnjnjqrbQtPW3zftdjrLNlUR8DYvnNpAK5V1vGNKX4nJKg4OB2uGpsnEz2nTaV8l8xyLGjG86qB5bB7lXPpBvjYxiyO0bC30SEvUJEejZvohCda7OiBPnh/iTVguoEHDVECpVXD7u/47VA3zljVX5M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578594855; 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=kzsojHYIGRSuu4HJqxw2YmbXcWGzmRge7L6Y5OsGVo8=; b=mflGugbULcC4nqnWm6nvle4KzGLlrtbT3nDIVzFIBMPrKKNWWRRTBwZI6hAXPbi4nb7NbzS8W/pz6oHwE3CuzkZbL4yoNGJRul0jcWqUEK7KhpiIggNt6i+Bf6rYWVEFgfBOxaAlv+nrXqqx+1e3ImQSueQZ6cC+lvWvVayjDwE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1578594855581621.0336443383742; Thu, 9 Jan 2020 10:34:15 -0800 (PST) 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-244-2wnrfMXjOeqUIMMRoPT_3g-1; Thu, 09 Jan 2020 13:34:12 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4E4D7800D48; Thu, 9 Jan 2020 18:34:07 +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 1A42786CB8; Thu, 9 Jan 2020 18:34:07 +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 C71B718089C8; Thu, 9 Jan 2020 18:34:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 009IY4u9019813 for ; Thu, 9 Jan 2020 13:34:04 -0500 Received: by smtp.corp.redhat.com (Postfix) id 89C4A2166B28; Thu, 9 Jan 2020 18:34:04 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 846952166B27 for ; Thu, 9 Jan 2020 18:34:04 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5FCE810192B3 for ; Thu, 9 Jan 2020 18:34:04 +0000 (UTC) Received: from mail-qv1-f65.google.com (mail-qv1-f65.google.com [209.85.219.65]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-364-GJFM2uJLMmCea57NdmpPOw-1; Thu, 09 Jan 2020 13:34:02 -0500 Received: by mail-qv1-f65.google.com with SMTP id n8so3374044qvg.11 for ; Thu, 09 Jan 2020 10:34:02 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:541e:7a5e:37ad:989b:4530]) by smtp.gmail.com with ESMTPSA id g52sm3902267qta.58.2020.01.09.10.34.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:34:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578594854; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=kzsojHYIGRSuu4HJqxw2YmbXcWGzmRge7L6Y5OsGVo8=; b=NnCKAOnPVoIs0Z7doS/KV31ZDvLJ3wPrSCi1NkijCPzaAtMap75cDTxwmSPR6RRUyJY+da X0xEHuecXLeZWypfBsyrpze7pEMO/5z7CFX+W1I+NI+ftgOLnFaCEsrfuhx8PkFj1oFZx3 Y/J/gZsZRFacrGJoJYxRozWaEDTQGvk= 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=u2nsCR5U6cPvHkYrh+Hju5q+VBVk0H+ii9yYYiK/lms=; b=Zh8FzehmZSoGcg/3xdaldeY1sSFbP9A2amFPLaYjq+kiMvAj2nTv4KvEDzqYYCbeGJ k+dBgCGtTGNzw+b9dJ2gjPhpRZ2eShKbl2d1SLerEbR6b8CJnMd9waGu2Hq7x/7IsAdo AfyHVVdV6x8HiHcf8l7zarkSeK+LRHrybJOHX8yRNGxZwmCstUo4IDjR1hHWJQs+3ZLN u8VMxG0ahVuUfFv1IXvDeJDLYYJ8gGLCoe4f5W3D1kL7JCyHbtvkUbivxxxx4k8+u3/F ITFwZsLYyFsW5Fr7hCow3g8b1FUM9gcxAK6+yUiWtOgH6nOlgB/pUjZEkU0M2CD9ftvK 84qg== X-Gm-Message-State: APjAAAV1eMqBAv4SBth1MjKe8KUkSGCtcDROL32lZvhsy8w0kphNS9c1 2yy/2Gm+bh6UzMZ0LMjC/eap2re4FvA= X-Google-Smtp-Source: APXvYqzDnWCf1aYt7E/HTPkxhlLE1o9RbciNby2sbpb4OGGJsykJJFP8N+jiOosz3K8Y8layW/Vkjg== X-Received: by 2002:a0c:9c86:: with SMTP id i6mr10057944qvf.214.1578594841334; Thu, 09 Jan 2020 10:34:01 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 15:33:44 -0300 Message-Id: <20200109183348.1362138-5-danielhb413@gmail.com> In-Reply-To: <20200109183348.1362138-1-danielhb413@gmail.com> References: <20200109183348.1362138-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: GJFM2uJLMmCea57NdmpPOw-1 X-MC-Unique: 2wnrfMXjOeqUIMMRoPT_3g-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 009IY4u9019813 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 4/8] qemu_domain.c: use g_autofree when possible 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.13 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Use g_autofree to remove VIR_FREE() calls used for cleanups. Labels that became deprecated will be removed in a later patch. In qemuDomainSetupDisk(), the 'dst' variable is not used at all and could be removed. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik and pushed. Sorry=20 --- src/qemu/qemu_domain.c | 139 +++++++++++++---------------------------- 1 file changed, 44 insertions(+), 95 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 999e0db49e..d76c6e0c0e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -877,7 +877,7 @@ int qemuDomainWriteMasterKeyFile(virQEMUDriverPtr driver, virDomainObjPtr vm) { - char *path; + g_autofree char *path =3D NULL; int fd =3D -1; int ret =3D -1; qemuDomainObjPrivatePtr priv =3D vm->privateData; @@ -908,7 +908,6 @@ qemuDomainWriteMasterKeyFile(virQEMUDriverPtr driver, =20 cleanup: VIR_FORCE_CLOSE(fd); - VIR_FREE(path); =20 return ret; } @@ -944,7 +943,7 @@ qemuDomainMasterKeyFree(qemuDomainObjPrivatePtr priv) int qemuDomainMasterKeyReadFile(qemuDomainObjPrivatePtr priv) { - char *path; + g_autofree char *path =3D NULL; int fd =3D -1; uint8_t *masterKey =3D NULL; ssize_t masterKeyLen =3D 0; @@ -990,7 +989,6 @@ qemuDomainMasterKeyReadFile(qemuDomainObjPrivatePtr pri= v) priv->masterKeyLen =3D masterKeyLen; =20 VIR_FORCE_CLOSE(fd); - VIR_FREE(path); =20 return 0; =20 @@ -1000,7 +998,6 @@ qemuDomainMasterKeyReadFile(qemuDomainObjPrivatePtr pr= iv) VIR_FREE(masterKey); =20 VIR_FORCE_CLOSE(fd); - VIR_FREE(path); =20 return -1; } @@ -1015,7 +1012,7 @@ qemuDomainMasterKeyReadFile(qemuDomainObjPrivatePtr p= riv) void qemuDomainMasterKeyRemove(qemuDomainObjPrivatePtr priv) { - char *path =3D NULL; + g_autofree char *path =3D NULL; =20 if (!priv->masterKey) return; @@ -1026,8 +1023,6 @@ qemuDomainMasterKeyRemove(qemuDomainObjPrivatePtr pri= v) /* Delete the master key file */ path =3D qemuDomainGetMasterKeyFilePath(priv->libDir); unlink(path); - - VIR_FREE(path); } =20 =20 @@ -1909,7 +1904,7 @@ qemuDomainSecretChardevPrepare(virQEMUDriverConfigPtr= cfg, const char *chrAlias, virDomainChrSourceDefPtr dev) { - char *charAlias =3D NULL; + g_autofree char *charAlias =3D NULL; =20 if (dev->type !=3D VIR_DOMAIN_CHR_TYPE_TCP) return 0; @@ -1925,7 +1920,6 @@ qemuDomainSecretChardevPrepare(virQEMUDriverConfigPtr= cfg, chrSourcePriv->secinfo =3D qemuDomainSecretInfoTLSNew(priv, charAlias, cfg->chardevTLSx509secretUUID); - VIR_FREE(charAlias); =20 if (!chrSourcePriv->secinfo) return -1; @@ -2143,7 +2137,7 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, { virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *domname =3D virDomainDefGetShortName(vm->def); + g_autofree char *domname =3D virDomainDefGetShortName(vm->def); int ret =3D -1; =20 if (!domname) @@ -2159,7 +2153,6 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, ret =3D 0; cleanup: virObjectUnref(cfg); - VIR_FREE(domname); return ret; } =20 @@ -2340,8 +2333,8 @@ qemuStorageSourcePrivateDataParse(xmlXPathContextPtr = ctxt, virStorageSourcePtr src) { qemuDomainStorageSourcePrivatePtr priv; - char *authalias =3D NULL; - char *encalias =3D NULL; + g_autofree char *authalias =3D NULL; + g_autofree char *encalias =3D NULL; int ret =3D -1; =20 src->nodestorage =3D virXPathString("string(./nodenames/nodename[@type= =3D'storage']/@name)", ctxt); @@ -2374,8 +2367,6 @@ qemuStorageSourcePrivateDataParse(xmlXPathContextPtr = ctxt, ret =3D 0; =20 cleanup: - VIR_FREE(authalias); - VIR_FREE(encalias); =20 return ret; } @@ -2497,8 +2488,8 @@ static int qemuDomainObjPrivateXMLFormatAutomaticPlacement(virBufferPtr buf, qemuDomainObjPrivatePtr pr= iv) { - char *nodeset =3D NULL; - char *cpuset =3D NULL; + g_autofree char *nodeset =3D NULL; + g_autofree char *cpuset =3D NULL; int ret =3D -1; =20 if (!priv->autoNodeset && !priv->autoCpuset) @@ -2520,8 +2511,6 @@ qemuDomainObjPrivateXMLFormatAutomaticPlacement(virBu= fferPtr buf, ret =3D 0; =20 cleanup: - VIR_FREE(nodeset); - VIR_FREE(cpuset); return ret; } =20 @@ -3022,8 +3011,8 @@ qemuDomainObjPrivateXMLParseVcpu(xmlNodePtr node, virDomainDefPtr def) { virDomainVcpuDefPtr vcpu; - char *idstr; - char *pidstr; + g_autofree char *idstr =3D NULL; + g_autofree char *pidstr =3D NULL; unsigned int tmp; int ret =3D -1; =20 @@ -3052,8 +3041,6 @@ qemuDomainObjPrivateXMLParseVcpu(xmlNodePtr node, ret =3D 0; =20 cleanup: - VIR_FREE(idstr); - VIR_FREE(pidstr); return ret; } =20 @@ -3064,8 +3051,8 @@ qemuDomainObjPrivateXMLParseAutomaticPlacement(xmlXPa= thContextPtr ctxt, virQEMUDriverPtr driver) { g_autoptr(virCapsHostNUMA) caps =3D NULL; - char *nodeset; - char *cpuset; + g_autofree char *nodeset =3D NULL; + g_autofree char *cpuset =3D NULL; int nodesetSize =3D 0; size_t i; int ret =3D -1; @@ -3106,8 +3093,6 @@ qemuDomainObjPrivateXMLParseAutomaticPlacement(xmlXPa= thContextPtr ctxt, ret =3D 0; =20 cleanup: - VIR_FREE(nodeset); - VIR_FREE(cpuset); =20 return ret; } @@ -3428,7 +3413,7 @@ qemuDomainObjPrivateXMLParseAllowReboot(xmlXPathConte= xtPtr ctxt, { int ret =3D -1; int val; - char *valStr; + g_autofree char *valStr =3D NULL; =20 if ((valStr =3D virXPathString("string(./allowReboot/@value)", ctxt)))= { if ((val =3D virTristateBoolTypeFromString(valStr)) < 0) { @@ -3442,7 +3427,6 @@ qemuDomainObjPrivateXMLParseAllowReboot(xmlXPathConte= xtPtr ctxt, ret =3D 0; =20 cleanup: - VIR_FREE(valStr); return ret; } =20 @@ -3507,8 +3491,7 @@ qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv, xmlXPathContextPtr ctxt) { - xmlNodePtr *nodes =3D NULL; - char *dst =3D NULL; + g_autofree xmlNodePtr *nodes =3D NULL; size_t i; int n; int ret =3D -1; @@ -3524,6 +3507,7 @@ qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr vm, } for (i =3D 0; i < n; i++) { virDomainDiskDefPtr disk; + g_autofree char *dst =3D NULL; =20 if ((dst =3D virXMLPropString(nodes[i], "dev")) && (disk =3D virDomainDiskByTarget(vm->def, dst))) { @@ -3534,16 +3518,12 @@ qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr = vm, priv->driver-= >xmlopt) < 0) goto cleanup; } - - VIR_FREE(dst); } } =20 ret =3D 0; =20 cleanup: - VIR_FREE(nodes); - VIR_FREE(dst); return ret; } =20 @@ -3554,7 +3534,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, xmlXPathContextPtr ctxt) { VIR_XPATH_NODE_AUTORESTORE(ctxt); - char *tmp =3D NULL; + g_autofree char *tmp =3D NULL; int ret =3D -1; =20 if (!(ctxt->node =3D virXPathNode("./job[1]", ctxt))) { @@ -3610,7 +3590,6 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, ret =3D 0; =20 cleanup: - VIR_FREE(tmp); return ret; } =20 @@ -3662,10 +3641,10 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctx= t, qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D config->priv; char *monitorpath; - char *tmp =3D NULL; + g_autofree char *tmp =3D NULL; int n; size_t i; - xmlNodePtr *nodes =3D NULL; + g_autofree xmlNodePtr *nodes =3D NULL; xmlNodePtr node =3D NULL; virQEMUCapsPtr qemuCaps =3D NULL; =20 @@ -3752,16 +3731,14 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctx= t, goto error; =20 for (i =3D 0; i < n; i++) { - char *str =3D virXMLPropString(nodes[i], "name"); + g_autofree char *str =3D virXMLPropString(nodes[i], "name"); if (str) { int flag =3D virQEMUCapsTypeFromString(str); if (flag < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown qemu capabilities flag %s"),= str); - VIR_FREE(str); goto error; } - VIR_FREE(str); virQEMUCapsSet(qemuCaps, flag); } } @@ -3867,8 +3844,6 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, return 0; =20 error: - VIR_FREE(nodes); - VIR_FREE(tmp); virBitmapFree(priv->namespaces); priv->namespaces =3D NULL; virObjectUnref(priv->monConfig); @@ -8553,7 +8528,7 @@ qemuDomainChrDefDropDefaultPath(virDomainChrDefPtr ch= r, { virQEMUDriverConfigPtr cfg; virBuffer buf =3D VIR_BUFFER_INITIALIZER; - char *regexp =3D NULL; + g_autofree char *regexp =3D NULL; int ret =3D -1; =20 if (chr->deviceType !=3D VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL || @@ -8575,7 +8550,6 @@ qemuDomainChrDefDropDefaultPath(virDomainChrDefPtr ch= r, VIR_FREE(chr->source->data.nix.path); =20 ret =3D 0; - VIR_FREE(regexp); virObjectUnref(cfg); return ret; } @@ -8871,8 +8845,8 @@ qemuDomainDeviceDiskDefPostParseRestoreSecAlias(virDo= mainDiskDefPtr disk, qemuDomainStorageSourcePrivatePtr priv =3D QEMU_DOMAIN_STORAGE_SOURCE_= PRIVATE(disk->src); bool restoreAuthSecret =3D false; bool restoreEncSecret =3D false; - char *authalias =3D NULL; - char *encalias =3D NULL; + g_autofree char *authalias =3D NULL; + g_autofree char *encalias =3D NULL; int ret =3D -1; =20 if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS) || @@ -8930,8 +8904,6 @@ qemuDomainDeviceDiskDefPostParseRestoreSecAlias(virDo= mainDiskDefPtr disk, ret =3D 0; =20 cleanup: - VIR_FREE(authalias); - VIR_FREE(encalias); return ret; } =20 @@ -10042,14 +10014,13 @@ qemuDomainDefCopy(virQEMUDriverPtr driver, unsigned int flags) { virDomainDefPtr ret =3D NULL; - char *xml; + g_autofree char *xml =3D NULL; =20 if (!(xml =3D qemuDomainDefFormatXML(driver, qemuCaps, src, flags))) return NULL; =20 ret =3D qemuDomainDefFromXML(driver, qemuCaps, xml); =20 - VIR_FREE(xml); return ret; } =20 @@ -10348,7 +10319,7 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver, qemuDomainLogContextPtr logCtxt) { virErrorPtr orig_err =3D NULL; - char *timestamp =3D NULL; + g_autofree char *timestamp =3D NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; int rc; =20 @@ -10389,7 +10360,6 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver, virResetLastError(); =20 cleanup: - VIR_FREE(timestamp); virErrorRestore(&orig_err); } =20 @@ -10586,7 +10556,7 @@ int qemuDomainLogContextWrite(qemuDomainLogContextP= tr ctxt, const char *fmt, ...) { va_list argptr; - char *message =3D NULL; + g_autofree char *message =3D NULL; int ret =3D -1; =20 va_start(argptr, fmt); @@ -10608,7 +10578,6 @@ int qemuDomainLogContextWrite(qemuDomainLogContextP= tr ctxt, =20 cleanup: va_end(argptr); - VIR_FREE(message); return ret; } =20 @@ -10677,9 +10646,9 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver, virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); virLogManagerPtr manager =3D NULL; va_list ap; - char *path =3D NULL; + g_autofree char *path =3D NULL; int writefd =3D -1; - char *message =3D NULL; + g_autofree char *message =3D NULL; int ret =3D -1; =20 va_start(ap, fmt); @@ -10713,11 +10682,9 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver, =20 cleanup: va_end(ap); - VIR_FREE(message); VIR_FORCE_CLOSE(writefd); virLogManagerFree(manager); virObjectUnref(cfg); - VIR_FREE(path); =20 return ret; } @@ -10765,10 +10732,10 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr v= m, virDomainXMLOptionPtr xmlopt, const char *snapshotDir) { - char *newxml =3D NULL; + g_autofree char *newxml =3D NULL; int ret =3D -1; - char *snapDir =3D NULL; - char *snapFile =3D NULL; + g_autofree char *snapDir =3D NULL; + g_autofree char *snapFile =3D NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; unsigned int flags =3D VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE | VIR_DOMAIN_SNAPSHOT_FORMAT_INTERNAL; @@ -10793,9 +10760,6 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, ret =3D virXMLSaveFile(snapFile, NULL, "snapshot-edit", newxml); =20 cleanup: - VIR_FREE(snapFile); - VIR_FREE(snapDir); - VIR_FREE(newxml); return ret; } =20 @@ -10900,7 +10864,7 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, bool update_parent, bool metadata_only) { - char *snapFile =3D NULL; + g_autofree char *snapFile =3D NULL; int ret =3D -1; qemuDomainObjPrivatePtr priv; virDomainMomentObjPtr parentsnap =3D NULL; @@ -10954,7 +10918,6 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, ret =3D 0; =20 cleanup: - VIR_FREE(snapFile); virObjectUnref(cfg); return ret; } @@ -12282,7 +12245,7 @@ qemuDomainCheckABIStability(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDefPtr migratableSrc =3D NULL; virDomainDefPtr migratableDst =3D NULL; - char *xml =3D NULL; + g_autofree char *xml =3D NULL; bool ret =3D false; =20 if (!(xml =3D qemuDomainFormatXML(driver, vm, COPY_FLAGS)) || @@ -12295,7 +12258,6 @@ qemuDomainCheckABIStability(virQEMUDriverPtr driver, dst, migratableDst); =20 cleanup: - VIR_FREE(xml); virDomainDefFree(migratableSrc); virDomainDefFree(migratableDst); return ret; @@ -14127,7 +14089,7 @@ qemuDomainGetPreservedMountPath(virQEMUDriverConfig= Ptr cfg, char *path =3D NULL; char *tmp; const char *suffix =3D mountpoint + strlen(QEMU_DEVPREFIX); - char *domname =3D virDomainDefGetShortName(vm->def); + g_autofree char *domname =3D virDomainDefGetShortName(vm->def); size_t off; =20 if (!domname) @@ -14152,7 +14114,6 @@ qemuDomainGetPreservedMountPath(virQEMUDriverConfig= Ptr cfg, tmp++; } =20 - VIR_FREE(domname); return path; } =20 @@ -14254,8 +14215,8 @@ qemuDomainCreateDeviceRecursive(const char *device, bool allow_noent, unsigned int ttl) { - char *devicePath =3D NULL; - char *target =3D NULL; + g_autofree char *devicePath =3D NULL; + g_autofree char *target =3D NULL; GStatBuf sb; int ret =3D -1; bool isLink =3D false; @@ -14365,15 +14326,13 @@ qemuDomainCreateDeviceRecursive(const char *devic= e, * /dev/stdout -> /proc/self/fd/1 (no change needed) */ if (!g_path_is_absolute(target)) { - char *c =3D NULL, *tmp =3D NULL, *devTmp =3D NULL; - - devTmp =3D g_strdup(device); + g_autofree char *devTmp =3D g_strdup(device); + char *c =3D NULL, *tmp =3D NULL; =20 if ((c =3D strrchr(devTmp, '/'))) *(c + 1) =3D '\0'; =20 tmp =3D g_strdup_printf("%s%s", devTmp, target); - VIR_FREE(devTmp); VIR_FREE(target); target =3D g_steal_pointer(&tmp); } @@ -14468,8 +14427,6 @@ qemuDomainCreateDeviceRecursive(const char *device, =20 ret =3D 0; cleanup: - VIR_FREE(target); - VIR_FREE(devicePath); #ifdef WITH_SELINUX freecon(tcon); #endif @@ -14515,8 +14472,8 @@ qemuDomainSetupDev(virQEMUDriverConfigPtr cfg, virDomainObjPtr vm, const struct qemuDomainCreateDeviceData *data) { - char *mount_options =3D NULL; - char *opts =3D NULL; + g_autofree char *mount_options =3D NULL; + g_autofree char *opts =3D NULL; int ret =3D -1; =20 VIR_DEBUG("Setting up /dev/ for domain %s", vm->def->name); @@ -14540,8 +14497,6 @@ qemuDomainSetupDev(virQEMUDriverConfigPtr cfg, =20 ret =3D 0; cleanup: - VIR_FREE(opts); - VIR_FREE(mount_options); return ret; } =20 @@ -14552,7 +14507,6 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_GN= UC_UNUSED, const struct qemuDomainCreateDeviceData *data) { virStorageSourcePtr next; - char *dst =3D NULL; bool hasNVMe =3D false; int ret =3D -1; =20 @@ -14589,7 +14543,6 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_GN= UC_UNUSED, =20 ret =3D 0; cleanup: - VIR_FREE(dst); return ret; } =20 @@ -15290,7 +15243,7 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverP= tr driver, virQEMUDriverConfigPtr cfg =3D NULL; struct qemuDomainAttachDeviceMknodData data; int ret =3D -1; - char *target =3D NULL; + g_autofree char *target =3D NULL; bool isLink; bool isReg; bool isDir; @@ -15337,15 +15290,13 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDrive= rPtr driver, } =20 if (!g_path_is_absolute(target)) { - char *c =3D NULL, *tmp =3D NULL, *fileTmp =3D NULL; - - fileTmp =3D g_strdup(file); + g_autofree char *fileTmp =3D g_strdup(file); + char *c =3D NULL, *tmp =3D NULL; =20 if ((c =3D strrchr(fileTmp, '/'))) *(c + 1) =3D '\0'; =20 tmp =3D g_strdup_printf("%s%s", fileTmp, target); - VIR_FREE(fileTmp); VIR_FREE(target); target =3D g_steal_pointer(&tmp); } @@ -15412,7 +15363,6 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverP= tr driver, virFileFreeACLs(&data.acl); if (isReg && target) umount(target); - VIR_FREE(target); virObjectUnref(cfg); return ret; } @@ -15946,7 +15896,7 @@ qemuDomainGetStorageSourceByDevstr(const char *devs= tr, { virDomainDiskDefPtr disk =3D NULL; virStorageSourcePtr src =3D NULL; - char *target =3D NULL; + g_autofree char *target =3D NULL; unsigned int idx; size_t i; =20 @@ -15975,7 +15925,6 @@ qemuDomainGetStorageSourceByDevstr(const char *devs= tr, src =3D virStorageFileChainLookup(disk->src, NULL, NULL, idx, NULL= ); =20 cleanup: - VIR_FREE(target); return src; } =20 --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 26 11:40:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1578594863; cv=none; d=zohomail.com; s=zohoarc; b=a9jmLd0ruf8VtewrBvPphQDHhECG2KeItUdGsaC0o0mcmJyTSvhRLhe2irSuCOgxcql2lgi+/Bg3YjeB9+JdB7N9Rn/+FMGBAkknOTH/f/mx2V0Y6K9lVywtvQ0EtqSNwx7FWyhWP492lz//wKuDk/Mv8aFhdEs9llrhVJHDjAY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578594863; 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=I/olIRXKeaoOSSoet/DVhVK4iQUBuDj3sIKjOFR2L2k=; b=lbG3kcYeiSjTYN6INE8xwRUZg6wMdkbzorJuUeXnGdd+96v38Znq4ycOZ5K28hFU+Pl3WWmuZjMZnt875tkGJ8qFSMk5n2rLkozgk00TKIqb3uwavh5OddBRa1VGH5ceBau3zlB3GW7REoJlOjgTydU9ID7JVn+l252kYdTYLgg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1578594863543648.9961160681312; Thu, 9 Jan 2020 10:34:23 -0800 (PST) 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-32-t4mWvK6ZPwuzrS5q5ui32A-1; Thu, 09 Jan 2020 13:34:17 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 13FCC8024E7; Thu, 9 Jan 2020 18:34:12 +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 D746160FC6; Thu, 9 Jan 2020 18:34:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 85081503CE; Thu, 9 Jan 2020 18:34:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 009IY5dP019818 for ; Thu, 9 Jan 2020 13:34:05 -0500 Received: by smtp.corp.redhat.com (Postfix) id 76BFB2166B28; Thu, 9 Jan 2020 18:34:05 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7081D2166B27 for ; Thu, 9 Jan 2020 18:34:05 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 482151019288 for ; Thu, 9 Jan 2020 18:34:05 +0000 (UTC) Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-207-lT0EqNHeM7ivfbYiMSAQ_A-1; Thu, 09 Jan 2020 13:34:03 -0500 Received: by mail-qt1-f181.google.com with SMTP id v25so4868862qto.7 for ; Thu, 09 Jan 2020 10:34:03 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:541e:7a5e:37ad:989b:4530]) by smtp.gmail.com with ESMTPSA id g52sm3902267qta.58.2020.01.09.10.34.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:34:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578594862; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=I/olIRXKeaoOSSoet/DVhVK4iQUBuDj3sIKjOFR2L2k=; b=FYHQPjx6/2yElLle9ZL7PbEYH917ox/to/S5+RimPChx35S+dgorODdNSntzABJJGUAuyu Xwstg5l5fr9Gb9tsCPJnEjYs4XEDI9aF7U+bSpcbI87494TEumxwTqIn5ImzrB0bqZg0Cq XGvDQncUK+IWpfRO37Bbd/Mxa7PxazE= 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=KOryB4xn0EOaSyNclSetf6aRz7mR6qkVv2gVYpqM/i0=; b=SmFNKtsW67vU0wUAtspcBeghDqwXupKmdhnfRiKtVbCeilM9kj79tzrKbWSAerbeER gdvqthujH1DLuNnUQH7WYWfOeoqDErmvAH6lYiX4NDo4bESAvNDYRZD61Dkvf6vY4H9i NrtiMJPHix/i3TQHI2PUTHLkJZMPT4afZfWFFhpU1MYe1zcXt7smpyc/+meoOvN5b4Un /R6v38DEQL8qE2qg3HVG+TWJDnmr/u0APimmlF4QrUVGJQBZCqB2JaRxRzgAKbxSduzU KexwxRmgjswA/7O6T+7KD9wlMDJLbL1lmiBHiakgfCIfnNJf8HPOBt9q2MB8D+8PkTFS jn8w== X-Gm-Message-State: APjAAAUuv6AKTp1sNm+zag3a5S+0VwXTtihe1gP9/xRMs209C1b25v+F AKEkBt1no+B3/gey5q5dXxLfa6MxX9U= X-Google-Smtp-Source: APXvYqyt8qUTxGc318N+OQsKe42WXtPUnZIjsY/PA30r8SsArE/t4Ev8K15FCGYO4ut4CtS6vxHp+Q== X-Received: by 2002:ac8:2bcd:: with SMTP id n13mr9372256qtn.21.1578594842695; Thu, 09 Jan 2020 10:34:02 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 15:33:45 -0300 Message-Id: <20200109183348.1362138-6-danielhb413@gmail.com> In-Reply-To: <20200109183348.1362138-1-danielhb413@gmail.com> References: <20200109183348.1362138-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: lT0EqNHeM7ivfbYiMSAQ_A-1 X-MC-Unique: t4mWvK6ZPwuzrS5q5ui32A-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 009IY5dP019818 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 5/8] qemu_domain.c: use g_autoptr when possible 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.12 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Avoid some of the virObjectUnref() calls by using g_autoptr. Aside from the 'cleanup' label in qemuDomainSetFakeReboot(), all other now deprecated cleanup labels will be removed in the next patch. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik and pushed. Sorry=20 --- src/qemu/qemu_domain.c | 87 ++++++++++++------------------------------ 1 file changed, 25 insertions(+), 62 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d76c6e0c0e..6bf704a6f5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1497,10 +1497,9 @@ qemuDomainSecretPlainSetup(qemuDomainSecretInfoPtr s= ecinfo, const char *username, virSecretLookupTypeDefPtr seclookupdef) { - virConnectPtr conn; + g_autoptr(virConnect) conn =3D virGetConnectSecret(); int ret =3D -1; =20 - conn =3D virGetConnectSecret(); if (!conn) return -1; =20 @@ -1511,7 +1510,6 @@ qemuDomainSecretPlainSetup(qemuDomainSecretInfoPtr se= cinfo, &secinfo->s.plain.secret, &secinfo->s.plain.secretlen); =20 - virObjectUnref(conn); return ret; } =20 @@ -1538,7 +1536,7 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv, virSecretLookupTypeDefPtr seclookupdef, bool isLuks) { - virConnectPtr conn; + g_autoptr(virConnect) conn =3D virGetConnectSecret(); int ret =3D -1; uint8_t *raw_iv =3D NULL; size_t ivlen =3D QEMU_DOMAIN_AES_IV_LEN; @@ -1547,7 +1545,6 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv, uint8_t *ciphertext =3D NULL; size_t ciphertextlen =3D 0; =20 - conn =3D virGetConnectSecret(); if (!conn) return -1; =20 @@ -1591,7 +1588,6 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv, VIR_DISPOSE_N(raw_iv, ivlen); VIR_DISPOSE_N(secret, secretlen); VIR_DISPOSE_N(ciphertext, ciphertextlen); - virObjectUnref(conn); return ret; } =20 @@ -2036,7 +2032,7 @@ qemuDomainSecretPrepare(virQEMUDriverPtr driver, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); size_t i; int ret =3D -1; =20 @@ -2107,7 +2103,6 @@ qemuDomainSecretPrepare(virQEMUDriverPtr driver, ret =3D 0; =20 cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -2118,7 +2113,7 @@ qemuDomainSetPrivatePathsOld(virQEMUDriverPtr driver, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (!priv->libDir) priv->libDir =3D g_strdup_printf("%s/domain-%s", cfg->libDir, vm->= def->name); @@ -2126,8 +2121,6 @@ qemuDomainSetPrivatePathsOld(virQEMUDriverPtr driver, if (!priv->channelTargetDir) priv->channelTargetDir =3D g_strdup_printf("%s/domain-%s", cfg->channelTargetDir, vm= ->def->name); - - virObjectUnref(cfg); } =20 =20 @@ -2135,7 +2128,7 @@ int qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, virDomainObjPtr vm) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autofree char *domname =3D virDomainDefGetShortName(vm->def); int ret =3D -1; @@ -2152,7 +2145,6 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, =20 ret =3D 0; cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -3646,7 +3638,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, size_t i; g_autofree xmlNodePtr *nodes =3D NULL; xmlNodePtr node =3D NULL; - virQEMUCapsPtr qemuCaps =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; =20 if (!(priv->monConfig =3D virDomainChrSourceDefNew(NULL))) goto error; @@ -3850,7 +3842,6 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, priv->monConfig =3D NULL; virStringListFree(priv->qemuDevices); priv->qemuDevices =3D NULL; - virObjectUnref(qemuCaps); return -1; } =20 @@ -5671,8 +5662,8 @@ qemuDomainDefValidate(const virDomainDef *def, void *opaque) { virQEMUDriverPtr driver =3D opaque; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - virQEMUCapsPtr qemuCaps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; int ret =3D -1; size_t i; =20 @@ -5878,8 +5869,6 @@ qemuDomainDefValidate(const virDomainDef *def, ret =3D 0; =20 cleanup: - virObjectUnref(qemuCaps); - virObjectUnref(cfg); return ret; } =20 @@ -8526,7 +8515,7 @@ static int qemuDomainChrDefDropDefaultPath(virDomainChrDefPtr chr, virQEMUDriverPtr driver) { - virQEMUDriverConfigPtr cfg; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virBuffer buf =3D VIR_BUFFER_INITIALIZER; g_autofree char *regexp =3D NULL; int ret =3D -1; @@ -8550,7 +8539,6 @@ qemuDomainChrDefDropDefaultPath(virDomainChrDefPtr ch= r, VIR_FREE(chr->source->data.nix.path); =20 ret =3D 0; - virObjectUnref(cfg); return ret; } =20 @@ -9207,14 +9195,12 @@ static void qemuDomainObjSaveStatus(virQEMUDriverPtr driver, virDomainObjPtr obj) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (virDomainObjIsActive(obj)) { if (virDomainObjSave(obj, driver->xmlopt, cfg->stateDir) < 0) VIR_WARN("Failed to save status on vm %s", obj->def->name); } - - virObjectUnref(cfg); } =20 =20 @@ -9375,7 +9361,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, unsigned long long then; bool nested =3D job =3D=3D QEMU_JOB_ASYNC_NESTED; bool async =3D job =3D=3D QEMU_JOB_ASYNC; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); const char *blocker =3D NULL; const char *agentBlocker =3D NULL; int ret =3D -1; @@ -9393,10 +9379,8 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr drive= r, qemuDomainAgentJobTypeToString(priv->job.agentActive), qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); =20 - if (virTimeMillisNow(&now) < 0) { - virObjectUnref(cfg); + if (virTimeMillisNow(&now) < 0) return -1; - } =20 priv->jobs_queued++; then =3D now + QEMU_JOB_WAIT_TIME; @@ -9478,7 +9462,6 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, if (qemuDomainTrackJob(job)) qemuDomainObjSaveStatus(driver, obj); =20 - virObjectUnref(cfg); return 0; =20 error: @@ -9570,7 +9553,6 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, =20 cleanup: priv->jobs_queued--; - virObjectUnref(cfg); return ret; } =20 @@ -10369,7 +10351,7 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr drive= r, qemuDomainLogContextPtr logCtxt) { size_t i; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D obj->privateData; bool custom_hypervisor_feat =3D false; =20 @@ -10410,8 +10392,6 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr drive= r, =20 if (obj->def->os.dtb) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_CUSTOM_DTB, logCt= xt); - - virObjectUnref(cfg); } =20 =20 @@ -10420,7 +10400,7 @@ void qemuDomainObjCheckDiskTaint(virQEMUDriverPtr d= river, virDomainDiskDefPtr disk, qemuDomainLogContextPtr logCtxt) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (disk->rawio =3D=3D VIR_TRISTATE_BOOL_YES) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HIGH_PRIVILEGES, @@ -10431,8 +10411,6 @@ void qemuDomainObjCheckDiskTaint(virQEMUDriverPtr d= river, disk->src->path && virFileIsCDROM(disk->src->path) =3D=3D 1) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_CDROM_PASSTHROUGH, logCtxt); - - virObjectUnref(cfg); } =20 =20 @@ -10468,7 +10446,7 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(vir= QEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainLogContextMode m= ode) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainLogContextPtr ctxt =3D NULL; =20 if (qemuDomainInitialize() < 0) @@ -10542,7 +10520,6 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(vir= QEMUDriverPtr driver, } =20 cleanup: - virObjectUnref(cfg); return ctxt; =20 error: @@ -10643,7 +10620,7 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver, const char *fmt, ...) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virLogManagerPtr manager =3D NULL; va_list ap; g_autofree char *path =3D NULL; @@ -10684,7 +10661,6 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver, va_end(ap); VIR_FORCE_CLOSE(writefd); virLogManagerFree(manager); - virObjectUnref(cfg); =20 return ret; } @@ -10868,7 +10844,7 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, int ret =3D -1; qemuDomainObjPrivatePtr priv; virDomainMomentObjPtr parentsnap =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (!metadata_only) { if (!virDomainObjIsActive(vm)) { @@ -10918,7 +10894,6 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, ret =3D 0; =20 cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -10962,12 +10937,10 @@ static void qemuDomainRemoveInactiveCommon(virQEMUDriverPtr driver, virDomainObjPtr vm) { - virQEMUDriverConfigPtr cfg; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autofree char *snapDir =3D NULL; g_autofree char *chkDir =3D NULL; =20 - cfg =3D virQEMUDriverGetConfig(driver); - /* Remove any snapshot metadata prior to removing the domain */ if (qemuDomainSnapshotDiscardAllMetadata(driver, vm) < 0) { VIR_WARN("unable to remove all snapshots for domain %s", @@ -10989,8 +10962,6 @@ qemuDomainRemoveInactiveCommon(virQEMUDriverPtr dri= ver, VIR_WARN("unable to remove checkpoint directory %s", chkDir); } qemuExtDevicesCleanupHost(driver, vm->def); - - virObjectUnref(cfg); } =20 =20 @@ -11086,18 +11057,15 @@ qemuDomainSetFakeReboot(virQEMUDriverPtr driver, bool value) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (priv->fakeReboot =3D=3D value) - goto cleanup; + return; =20 priv->fakeReboot =3D value; =20 if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) VIR_WARN("Failed to save status on vm %s", vm->def->name); - - cleanup: - virObjectUnref(cfg); } =20 static void @@ -11304,7 +11272,7 @@ qemuDomainStorageFileInit(virQEMUDriverPtr driver, virStorageSourcePtr src, virStorageSourcePtr parent) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); uid_t uid; gid_t gid; int ret =3D -1; @@ -11317,7 +11285,6 @@ qemuDomainStorageFileInit(virQEMUDriverPtr driver, ret =3D 0; =20 cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -15026,7 +14993,7 @@ int qemuDomainCreateNamespace(virQEMUDriverPtr driver, virDomainObjPtr vm) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int ret =3D -1; =20 if (virBitmapIsBitSet(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT) && @@ -15035,7 +15002,6 @@ qemuDomainCreateNamespace(virQEMUDriverPtr driver, =20 ret =3D 0; cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -15240,7 +15206,7 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverP= tr driver, size_t ndevMountsPath, unsigned int ttl) { - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; struct qemuDomainAttachDeviceMknodData data; int ret =3D -1; g_autofree char *target =3D NULL; @@ -15363,7 +15329,6 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverP= tr driver, virFileFreeACLs(&data.acl); if (isReg && target) umount(target); - virObjectUnref(cfg); return ret; } =20 @@ -15456,7 +15421,7 @@ qemuDomainNamespaceMknodPaths(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; - virQEMUDriverConfigPtr cfg; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; char **devMountsPath =3D NULL; size_t ndevMountsPath =3D 0; int ret =3D -1; @@ -15483,7 +15448,6 @@ qemuDomainNamespaceMknodPaths(virDomainObjPtr vm, ret =3D 0; cleanup: virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); return ret; } =20 @@ -15505,7 +15469,7 @@ qemuDomainNamespaceUnlinkPaths(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; - virQEMUDriverConfigPtr cfg; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; char **devMountsPath =3D NULL; size_t ndevMountsPath =3D 0; size_t i; @@ -15531,7 +15495,6 @@ qemuDomainNamespaceUnlinkPaths(virDomainObjPtr vm, ret =3D 0; cleanup: virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); return ret; } =20 --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 26 11:40:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1578594860; cv=none; d=zohomail.com; s=zohoarc; b=W9tJsioyDcMz4fOQvhEseUkwSNBBbip5wj36vhg1ZRKQC6q4TUfO4Qi6OEBMDNUBNycZ8Jtf5p/k0iFmB3WOC3FK8knAf5nBBn0WNXOUTBU9DsBOZz/1Bp6LrooINV+5FktqFY1DRqghmdIUCaS5oO8YsqyHL/wgJFrqfmVBy3g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578594860; 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=Fc+8UfyjYzGiscBJvXJJdESvT0m+2MEdTLCKPLBUYvo=; b=T4UFmt2zlcD7KFq8dt1IVWoZGAayI3R+gW7zsoXR+sv1RHpleLKtpZSN+C9c75InlFVIT51dyvPGNXS2xeRO3mp+JNfAN1wbrmZxuPon6nuLkz3xTCm+k+PlKVVo/Su9BhbNTRj/uPkKTsSYZgoN4Uz9wwzvhTOhwCr9rmGmsjM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1578594860181907.7031799253704; Thu, 9 Jan 2020 10:34:20 -0800 (PST) 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-39-1pQoPnrUOZ65S2VFHQveRA-1; Thu, 09 Jan 2020 13:34:16 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E8E6118A6EC8; Thu, 9 Jan 2020 18:34:10 +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 BDE5786CBF; Thu, 9 Jan 2020 18:34:10 +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 6B2F518089CE; Thu, 9 Jan 2020 18:34:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 009IY65o019833 for ; Thu, 9 Jan 2020 13:34:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id BB6A720230A6; Thu, 9 Jan 2020 18:34:06 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B5B07202A941 for ; Thu, 9 Jan 2020 18:34:06 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 816BF86D729 for ; Thu, 9 Jan 2020 18:34:06 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-251-h6arXWSYOoic_p6mC3HjqQ-1; Thu, 09 Jan 2020 13:34:04 -0500 Received: by mail-qt1-f193.google.com with SMTP id k40so6684548qtk.8 for ; Thu, 09 Jan 2020 10:34:04 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:541e:7a5e:37ad:989b:4530]) by smtp.gmail.com with ESMTPSA id g52sm3902267qta.58.2020.01.09.10.34.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:34:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578594859; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=Fc+8UfyjYzGiscBJvXJJdESvT0m+2MEdTLCKPLBUYvo=; b=QngceaD/qzDPOONyH9lQic4gDrA/EjAo7X7sQNvEYJNldN5oXPgWEqi7LUnuyJZn7SD8em gNgEEY3FY2kYoaSgDntTZ8gIeAG+v+SVct51bsbB0/8vnwDQq/AWEAMKNFcvaVeUX/1ChO uE9JhhvHV64Q0hmkCAjWsa3aj+Y9phg= 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=nFi51Z15UwQ7OE9pccHheplyKnP6On3Ox1vcSBziCh8=; b=d/d320V/cFrpUCUOVcmgva7buBOr8brYCGpZQjfTwNcQarbc63yR9Q8o+vo01RpJkQ W7YnBcDQ+Mr94DPC1aX5TFQY8JsD7imiqmtjDJARJfaFPqKRD9xLToL2uWTzNoItuwgu l1S40ZAV5/Rrf2p8aQXCs+imBT3LYbhkEUrQ9CuQRFp4DRYeC6ZdchuaHNnMO3NliAwv p9lj6S7nrgijhhfM7XYOpfY7zobD1VtT+suNl3D80Dn5g6+1pAppDlro4WWL3XmoU9vO RWNkrQUXNF9fjLtYza2CWRRy0U6Y7qsV0FtMuGI7zBZs1mYCGHC6un1uG1yTSUn3e5B2 upqw== X-Gm-Message-State: APjAAAUdTPDaeuTXQ3DuIACKT5o/eBfd94Utvtz7+PXChGjn0J297MTh UcfqDAa+ZN1AGFUmL1lXaaHNa1xzRGQ= X-Google-Smtp-Source: APXvYqydlkzjWVbexc1zgCzqdwQGq5+iLf7MEBQ5mb0YBVkrt8HxDH0rbnS2bWiJuN/aC7+6bzaNoA== X-Received: by 2002:aed:3c7b:: with SMTP id u56mr9172760qte.82.1578594843883; Thu, 09 Jan 2020 10:34:03 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 15:33:46 -0300 Message-Id: <20200109183348.1362138-7-danielhb413@gmail.com> In-Reply-To: <20200109183348.1362138-1-danielhb413@gmail.com> References: <20200109183348.1362138-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: h6arXWSYOoic_p6mC3HjqQ-1 X-MC-Unique: 1pQoPnrUOZ65S2VFHQveRA-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 009IY65o019833 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 6/8] qemu_domain.c: removing unneeded cleanup labels 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.13 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Previous patches deprecated some 'cleanup' labels. Let's remove them. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik and pushed. Sorry=20 --- src/qemu/qemu_domain.c | 267 +++++++++++++++-------------------------- 1 file changed, 98 insertions(+), 169 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6bf704a6f5..931554eeb6 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2034,42 +2034,41 @@ qemuDomainSecretPrepare(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); size_t i; - int ret =3D -1; =20 /* disk secrets are prepared when preparing disks */ =20 for (i =3D 0; i < vm->def->nhostdevs; i++) { if (qemuDomainSecretHostdevPrepare(priv, vm->def->hostdevs[i]) < 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < vm->def->nserials; i++) { if (qemuDomainSecretChardevPrepare(cfg, priv, vm->def->serials[i]->info.alias, vm->def->serials[i]->source) < = 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < vm->def->nparallels; i++) { if (qemuDomainSecretChardevPrepare(cfg, priv, vm->def->parallels[i]->info.ali= as, vm->def->parallels[i]->source) = < 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < vm->def->nchannels; i++) { if (qemuDomainSecretChardevPrepare(cfg, priv, vm->def->channels[i]->info.alia= s, vm->def->channels[i]->source) <= 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < vm->def->nconsoles; i++) { if (qemuDomainSecretChardevPrepare(cfg, priv, vm->def->consoles[i]->info.alia= s, vm->def->consoles[i]->source) <= 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < vm->def->nsmartcards; i++) @@ -2078,32 +2077,29 @@ qemuDomainSecretPrepare(virQEMUDriverPtr driver, qemuDomainSecretChardevPrepare(cfg, priv, vm->def->smartcards[i]->info.al= ias, vm->def->smartcards[i]->data.pa= ssthru) < 0) - goto cleanup; + return -1; =20 for (i =3D 0; i < vm->def->nrngs; i++) { if (vm->def->rngs[i]->backend =3D=3D VIR_DOMAIN_RNG_BACKEND_EGD && qemuDomainSecretChardevPrepare(cfg, priv, vm->def->rngs[i]->info.alias, vm->def->rngs[i]->source.charde= v) < 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < vm->def->nredirdevs; i++) { if (qemuDomainSecretChardevPrepare(cfg, priv, vm->def->redirdevs[i]->info.ali= as, vm->def->redirdevs[i]->source) = < 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < vm->def->ngraphics; i++) { if (qemuDomainSecretGraphicsPrepare(cfg, priv, vm->def->graphics[i= ]) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -2131,10 +2127,9 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autofree char *domname =3D virDomainDefGetShortName(vm->def); - int ret =3D -1; =20 if (!domname) - goto cleanup; + return -1; =20 if (!priv->libDir) priv->libDir =3D g_strdup_printf("%s/domain-%s", cfg->libDir, domn= ame); @@ -2143,9 +2138,7 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, priv->channelTargetDir =3D g_strdup_printf("%s/domain-%s", cfg->channelTargetDir, do= mname); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -2327,7 +2320,6 @@ qemuStorageSourcePrivateDataParse(xmlXPathContextPtr = ctxt, qemuDomainStorageSourcePrivatePtr priv; g_autofree char *authalias =3D NULL; g_autofree char *encalias =3D NULL; - int ret =3D -1; =20 src->nodestorage =3D virXPathString("string(./nodenames/nodename[@type= =3D'storage']/@name)", ctxt); src->nodeformat =3D virXPathString("string(./nodenames/nodename[@type= =3D'format']/@name)", ctxt); @@ -2342,25 +2334,21 @@ qemuStorageSourcePrivateDataParse(xmlXPathContextPt= r ctxt, if (authalias || encalias) { if (!src->privateData && !(src->privateData =3D qemuDomainStorageSourcePrivateNew())) - goto cleanup; + return -1; =20 priv =3D QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); =20 if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->secinfo, &aut= halias) < 0) - goto cleanup; + return -1; =20 if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->encinfo, &enc= alias) < 0) - goto cleanup; + return -1; } =20 if (virStorageSourcePrivateDataParseRelPath(ctxt, src) < 0) - goto cleanup; - - ret =3D 0; - - cleanup: + return -1; =20 - return ret; + return 0; } =20 =20 @@ -2482,28 +2470,24 @@ qemuDomainObjPrivateXMLFormatAutomaticPlacement(vir= BufferPtr buf, { g_autofree char *nodeset =3D NULL; g_autofree char *cpuset =3D NULL; - int ret =3D -1; =20 if (!priv->autoNodeset && !priv->autoCpuset) return 0; =20 if (priv->autoNodeset && !((nodeset =3D virBitmapFormat(priv->autoNodeset)))) - goto cleanup; + return -1; =20 if (priv->autoCpuset && !((cpuset =3D virBitmapFormat(priv->autoCpuset)))) - goto cleanup; + return -1; =20 virBufferAddLit(buf, "\n"); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -3006,7 +2990,6 @@ qemuDomainObjPrivateXMLParseVcpu(xmlNodePtr node, g_autofree char *idstr =3D NULL; g_autofree char *pidstr =3D NULL; unsigned int tmp; - int ret =3D -1; =20 idstr =3D virXMLPropString(node, "id"); =20 @@ -3014,26 +2997,23 @@ qemuDomainObjPrivateXMLParseVcpu(xmlNodePtr node, (virStrToLong_uip(idstr, NULL, 10, &idx) < 0)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse vcpu index '%s'"), idstr); - goto cleanup; + return -1; } if (!(vcpu =3D virDomainDefGetVcpu(def, idx))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid vcpu index '%u'"), idx); - goto cleanup; + return -1; } =20 if (!(pidstr =3D virXMLPropString(node, "pid"))) - goto cleanup; + return -1; =20 if (virStrToLong_uip(pidstr, NULL, 10, &tmp) < 0) - goto cleanup; + return -1; =20 QEMU_DOMAIN_VCPU_PRIVATE(vcpu)->tid =3D tmp; =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -3047,7 +3027,6 @@ qemuDomainObjPrivateXMLParseAutomaticPlacement(xmlXPa= thContextPtr ctxt, g_autofree char *cpuset =3D NULL; int nodesetSize =3D 0; size_t i; - int ret =3D -1; =20 nodeset =3D virXPathString("string(./numad/@nodeset)", ctxt); cpuset =3D virXPathString("string(./numad/@cpuset)", ctxt); @@ -3056,7 +3035,7 @@ qemuDomainObjPrivateXMLParseAutomaticPlacement(xmlXPa= thContextPtr ctxt, return 0; =20 if (!(caps =3D virQEMUDriverGetHostNUMACaps(driver))) - goto cleanup; + return -1; =20 /* Figure out how big the nodeset bitmap needs to be. * This is necessary because NUMA node IDs are not guaranteed to @@ -3069,24 +3048,20 @@ qemuDomainObjPrivateXMLParseAutomaticPlacement(xmlX= PathContextPtr ctxt, =20 if (nodeset && virBitmapParse(nodeset, &priv->autoNodeset, nodesetSize) < 0) - goto cleanup; + return -1; =20 if (cpuset) { if (virBitmapParse(cpuset, &priv->autoCpuset, VIR_DOMAIN_CPUMASK_L= EN) < 0) - goto cleanup; + return -1; } else { /* autoNodeset is present in this case, since otherwise we wouldn't * reach this code */ if (!(priv->autoCpuset =3D virCapabilitiesHostNUMAGetCpus(caps, priv->auto= Nodeset))) - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - - return ret; + return 0; } =20 =20 @@ -3403,7 +3378,6 @@ int qemuDomainObjPrivateXMLParseAllowReboot(xmlXPathContextPtr ctxt, virTristateBool *allowReboot) { - int ret =3D -1; int val; g_autofree char *valStr =3D NULL; =20 @@ -3411,15 +3385,12 @@ qemuDomainObjPrivateXMLParseAllowReboot(xmlXPathCon= textPtr ctxt, if ((val =3D virTristateBoolTypeFromString(valStr)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid allowReboot value '%s'"), valStr); - goto cleanup; + return -1; } *allowReboot =3D val; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -3486,10 +3457,9 @@ qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr v= m, g_autofree xmlNodePtr *nodes =3D NULL; size_t i; int n; - int ret =3D -1; =20 if ((n =3D virXPathNodeSet("./disk[@migrating=3D'yes']", ctxt, &nodes)= ) < 0) - goto cleanup; + return -1; =20 if (n > 0) { if (priv->job.asyncJob !=3D QEMU_ASYNC_JOB_MIGRATION_OUT) { @@ -3508,15 +3478,12 @@ qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr = vm, if (qemuDomainObjPrivateXMLParseJobNBDSource(nodes[i], ctx= t, disk, priv->driver-= >xmlopt) < 0) - goto cleanup; + return -1; } } } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -3527,12 +3494,9 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, { VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree char *tmp =3D NULL; - int ret =3D -1; =20 - if (!(ctxt->node =3D virXPathNode("./job[1]", ctxt))) { - ret =3D 0; - goto cleanup; - } + if (!(ctxt->node =3D virXPathNode("./job[1]", ctxt))) + return 0; =20 if ((tmp =3D virXPathString("string(@type)", ctxt))) { int type; @@ -3540,7 +3504,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, if ((type =3D qemuDomainJobTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown job type %s"), tmp); - goto cleanup; + return -1; } VIR_FREE(tmp); priv->job.active =3D type; @@ -3552,7 +3516,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, if ((async =3D qemuDomainAsyncJobTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown async job type %s"), tmp); - goto cleanup; + return -1; } VIR_FREE(tmp); priv->job.asyncJob =3D async; @@ -3562,7 +3526,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, if (priv->job.phase < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown job phase %s"), tmp); - goto cleanup; + return -1; } VIR_FREE(tmp); } @@ -3570,19 +3534,16 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, =20 if (virXPathULongHex("string(@flags)", ctxt, &priv->job.apiFlags) =3D= =3D -2) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid job flags"= )); - goto cleanup; + return -1; } =20 if (qemuDomainObjPrivateXMLParseJobNBD(vm, priv, ctxt) < 0) - goto cleanup; + return -1; =20 if (qemuMigrationParamsParse(ctxt, &priv->job.migParams) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -5664,38 +5625,37 @@ qemuDomainDefValidate(const virDomainDef *def, virQEMUDriverPtr driver =3D opaque; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autoptr(virQEMUCaps) qemuCaps =3D NULL; - int ret =3D -1; size_t i; =20 if (!(qemuCaps =3D virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator))) - goto cleanup; + return -1; =20 if (def->os.type !=3D VIR_DOMAIN_OSTYPE_HVM) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Emulator '%s' does not support os type '%s'"), def->emulator, virDomainOSTypeToString(def->os.type= )); - goto cleanup; + return -1; } =20 if (!virQEMUCapsIsArchSupported(qemuCaps, def->os.arch)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Emulator '%s' does not support arch '%s'"), def->emulator, virArchToString(def->os.arch)); - goto cleanup; + return -1; } =20 if (!virQEMUCapsIsVirtTypeSupported(qemuCaps, def->virtType)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Emulator '%s' does not support virt type '%s'"), def->emulator, virDomainVirtTypeToString(def->virtT= ype)); - goto cleanup; + return -1; } =20 if (def->mem.min_guarantee) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Parameter 'min_guarantee' not supported by QEMU.= ")); - goto cleanup; + return -1; } =20 /* On x86, UEFI requires ACPI */ @@ -5705,7 +5665,7 @@ qemuDomainDefValidate(const virDomainDef *def, def->features[VIR_DOMAIN_FEATURE_ACPI] !=3D VIR_TRISTATE_SWITCH_ON= ) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("UEFI requires ACPI on this architecture")); - goto cleanup; + return -1; } =20 /* On aarch64, ACPI requires UEFI */ @@ -5715,7 +5675,7 @@ qemuDomainDefValidate(const virDomainDef *def, !virDomainDefHasOldStyleUEFI(def))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("ACPI requires UEFI on this architecture")); - goto cleanup; + return -1; } =20 if (def->os.loader && @@ -5726,7 +5686,7 @@ qemuDomainDefValidate(const virDomainDef *def, if (!qemuDomainIsQ35(def)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Secure boot is supported with q35 machine ty= pes only")); - goto cleanup; + return -1; } =20 /* Now, technically it is possible to have secure boot on @@ -5735,7 +5695,7 @@ qemuDomainDefValidate(const virDomainDef *def, if (def->os.arch !=3D VIR_ARCH_X86_64) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Secure boot is supported for x86_64 architec= ture only")); - goto cleanup; + return -1; } =20 /* SMM will be enabled by qemuFirmwareFillDomain() if needed. */ @@ -5743,7 +5703,7 @@ qemuDomainDefValidate(const virDomainDef *def, def->features[VIR_DOMAIN_FEATURE_SMM] !=3D VIR_TRISTATE_SWITCH= _ON) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Secure boot requires SMM feature enabled")); - goto cleanup; + return -1; } } =20 @@ -5751,7 +5711,7 @@ qemuDomainDefValidate(const virDomainDef *def, !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMGENID)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("this QEMU does not support the 'genid' capabilit= y")); - goto cleanup; + return -1; } =20 /* Serial graphics adapter */ @@ -5759,23 +5719,23 @@ qemuDomainDefValidate(const virDomainDef *def, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGA)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("qemu does not support SGA")); - goto cleanup; + return -1; } if (!def->nserials) { virReportError(VIR_ERR_XML_ERROR, "%s", _("need at least one serial port to use SGA")); - goto cleanup; + return -1; } } =20 if (qemuDomainDefValidateClockTimers(def, qemuCaps) < 0) - goto cleanup; + return -1; =20 if (qemuDomainDefValidatePM(def, qemuCaps) < 0) - goto cleanup; + return -1; =20 if (qemuDomainDefValidateBoot(def, qemuCaps) < 0) - goto cleanup; + return -1; =20 /* QEMU 2.7 (detected via the availability of query-hotpluggable-cpus) * enforces stricter rules than previous versions when it comes to gue= st @@ -5792,7 +5752,7 @@ qemuDomainDefValidate(const virDomainDef *def, if (topologycpus !=3D virDomainDefGetVcpusMax(def)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("CPU topology doesn't match maximum vcpu = count")); - goto cleanup; + return -1; } =20 numacpus =3D virDomainNumaGetCPUCountTotal(def->numa); @@ -5810,12 +5770,12 @@ qemuDomainDefValidate(const virDomainDef *def, _("vCPUs count must be a multiple of the vCPU " "hotplug granularity (%u)"), granularity); - goto cleanup; + return -1; } } =20 if (qemuDomainValidateCpuCount(def, qemuCaps) < 0) - goto cleanup; + return -1; =20 if (ARCH_IS_X86(def->os.arch) && virDomainDefGetVcpusMax(def) > QEMU_MAX_VCPUS_WITHOUT_EIM) { @@ -5824,14 +5784,14 @@ qemuDomainDefValidate(const virDomainDef *def, _("more than %d vCPUs are only supported on " "q35-based machine types"), QEMU_MAX_VCPUS_WITHOUT_EIM); - goto cleanup; + return -1; } if (!def->iommu || def->iommu->eim !=3D VIR_TRISTATE_SWITCH_ON) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("more than %d vCPUs require extended interrup= t " "mode enabled on the iommu device"), QEMU_MAX_VCPUS_WITHOUT_EIM); - goto cleanup; + return -1; } } =20 @@ -5839,20 +5799,20 @@ qemuDomainDefValidate(const virDomainDef *def, def->virtType !=3D VIR_DOMAIN_VIRT_KVM) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("cachetune is only supported for KVM domains")); - goto cleanup; + return -1; } =20 if (qemuDomainDefValidateFeatures(def, qemuCaps) < 0) - goto cleanup; + return -1; =20 if (qemuDomainDefValidateMemory(def, qemuCaps) < 0) - goto cleanup; + return -1; =20 if (qemuDomainDefValidateNuma(def, qemuCaps) < 0) - goto cleanup; + return -1; =20 if (qemuDomainDefValidateConsole(def, qemuCaps) < 0) - goto cleanup; + return -1; =20 if (cfg->vncTLS && cfg->vncTLSx509secretUUID && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_TLS_CREDS_X509)) { @@ -5861,15 +5821,12 @@ qemuDomainDefValidate(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("encrypted VNC TLS keys are not supported= with " "this QEMU binary")); - goto cleanup; + return -1; } } } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -8835,7 +8792,6 @@ qemuDomainDeviceDiskDefPostParseRestoreSecAlias(virDo= mainDiskDefPtr disk, bool restoreEncSecret =3D false; g_autofree char *authalias =3D NULL; g_autofree char *encalias =3D NULL; - int ret =3D -1; =20 if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS) || !qemuCaps || @@ -8875,24 +8831,21 @@ qemuDomainDeviceDiskDefPostParseRestoreSecAlias(vir= DomainDiskDefPtr disk, =20 if (restoreAuthSecret) { if (!(authalias =3D qemuDomainGetSecretAESAlias(disk->info.alias, = false))) - goto cleanup; + return -1; =20 if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->secinfo, &aut= halias) < 0) - goto cleanup; + return -1; } =20 if (restoreEncSecret) { if (!(encalias =3D qemuDomainGetSecretAESAlias(disk->info.alias, t= rue))) - goto cleanup; + return -1; =20 if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->encinfo, &enc= alias) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -10450,10 +10403,10 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(v= irQEMUDriverPtr driver, qemuDomainLogContextPtr ctxt =3D NULL; =20 if (qemuDomainInitialize() < 0) - goto cleanup; + return NULL; =20 if (!(ctxt =3D virObjectNew(qemuDomainLogContextClass))) - goto cleanup; + return NULL; =20 VIR_DEBUG("Context new %p stdioLogD=3D%d", ctxt, cfg->stdioLogD); ctxt->writefd =3D -1; @@ -10519,13 +10472,11 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(v= irQEMUDriverPtr driver, } } =20 - cleanup: return ctxt; =20 error: virObjectUnref(ctxt); - ctxt =3D NULL; - goto cleanup; + return NULL; } =20 =20 @@ -10709,7 +10660,6 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, const char *snapshotDir) { g_autofree char *newxml =3D NULL; - int ret =3D -1; g_autofree char *snapDir =3D NULL; g_autofree char *snapFile =3D NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; @@ -10728,15 +10678,12 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr v= m, if (virFileMakePath(snapDir) < 0) { virReportSystemError(errno, _("cannot create snapshot directory '%= s'"), snapDir); - goto cleanup; + return -1; } =20 snapFile =3D g_strdup_printf("%s/%s.xml", snapDir, def->parent.name); =20 - ret =3D virXMLSaveFile(snapFile, NULL, "snapshot-edit", newxml); - - cleanup: - return ret; + return virXMLSaveFile(snapFile, NULL, "snapshot-edit", newxml); } =20 =20 @@ -10841,7 +10788,6 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, bool metadata_only) { g_autofree char *snapFile =3D NULL; - int ret =3D -1; qemuDomainObjPrivatePtr priv; virDomainMomentObjPtr parentsnap =3D NULL; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); @@ -10851,7 +10797,7 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, /* Ignore any skipped disks */ if (qemuDomainSnapshotForEachQcow2(driver, vm, snap, "-d", true) < 0) - goto cleanup; + return -1; } else { priv =3D vm->privateData; qemuDomainObjEnterMonitor(driver, vm); @@ -10891,10 +10837,7 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, virDomainMomentDropParent(snap); virDomainSnapshotObjListRemove(vm->snapshots, snap); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 /* Hash iterator callback to discard multiple snapshots. */ @@ -11275,17 +11218,13 @@ qemuDomainStorageFileInit(virQEMUDriverPtr driver, g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); uid_t uid; gid_t gid; - int ret =3D -1; =20 qemuDomainGetImageIds(cfg, vm, src, parent, &uid, &gid); =20 if (virStorageFileInitAs(src, uid, gid) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -14441,7 +14380,6 @@ qemuDomainSetupDev(virQEMUDriverConfigPtr cfg, { g_autofree char *mount_options =3D NULL; g_autofree char *opts =3D NULL; - int ret =3D -1; =20 VIR_DEBUG("Setting up /dev/ for domain %s", vm->def->name); =20 @@ -14457,14 +14395,12 @@ qemuDomainSetupDev(virQEMUDriverConfigPtr cfg, opts =3D g_strdup_printf("mode=3D755,size=3D65536%s", mount_options); =20 if (virFileSetupDev(data->path, opts) < 0) - goto cleanup; + return -1; =20 if (qemuDomainPopulateDevices(cfg, vm, data) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -14475,7 +14411,6 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_GN= UC_UNUSED, { virStorageSourcePtr next; bool hasNVMe =3D false; - int ret =3D -1; =20 for (next =3D disk->src; virStorageSourceIsBacking(next); next =3D nex= t->backingStore) { if (next->type =3D=3D VIR_STORAGE_TYPE_NVME) { @@ -14484,10 +14419,10 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_= GNUC_UNUSED, hasNVMe =3D true; =20 if (!(nvmePath =3D virPCIDeviceAddressGetIOMMUGroupDev(&next->= nvme->pciAddr))) - goto cleanup; + return -1; =20 if (qemuDomainCreateDevice(nvmePath, data, false) < 0) - goto cleanup; + return -1; } else { if (!next->path || !virStorageSourceIsLocalStorage(next)) { /* Not creating device. Just continue. */ @@ -14495,22 +14430,20 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_= GNUC_UNUSED, } =20 if (qemuDomainCreateDevice(next->path, data, false) < 0) - goto cleanup; + return -1; } } =20 /* qemu-pr-helper might require access to /dev/mapper/control. */ if (disk->src->pr && qemuDomainCreateDevice(QEMU_DEVICE_MAPPER_CONTROL_PATH, data, true= ) < 0) - goto cleanup; + return -1; =20 if (hasNVMe && qemuDomainCreateDevice(QEMU_DEV_VFIO, data, false) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -14994,15 +14927,12 @@ qemuDomainCreateNamespace(virQEMUDriverPtr driver, virDomainObjPtr vm) { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - int ret =3D -1; =20 if (virBitmapIsBitSet(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT) && qemuDomainEnableNamespace(vm, QEMU_DOMAIN_NS_MOUNT) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -15879,7 +15809,7 @@ qemuDomainGetStorageSourceByDevstr(const char *devs= tr, if (!disk) { virReportError(VIR_ERR_INVALID_ARG, _("failed to find disk '%s'"), target); - goto cleanup; + return NULL; } =20 if (idx =3D=3D 0) @@ -15887,7 +15817,6 @@ qemuDomainGetStorageSourceByDevstr(const char *devs= tr, else src =3D virStorageFileChainLookup(disk->src, NULL, NULL, idx, NULL= ); =20 - cleanup: return src; } =20 --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 26 11:40:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1578594902; cv=none; d=zohomail.com; s=zohoarc; b=NGdrp7iKruU7WaKcPz8zae0Ybo9v0ExvI5CysaOr4e7f8AaFzxaFHcoNrIcgx5UWLNUy1xIVIzQegyCUxlXuw3Q367ZAVK+ymoe+T+40MGxCHWHsgKTqXAuQszArfYV5VGtMB63n1gu5qYPLKWFXBLXu95gryuMpu3XXC0DvucQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578594902; 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=lXlt3wJQwpWhR5t7PSAENuX2ZaUrH+WDcCioOYLbZGw=; b=GcxN4NoINFV9w6Oo4M7VvSbRgt7wuD/haJaelG1X+VBgg4npDH0SV7g4jXWFsfsJZLyOiTaWXNk2Xrv4h5RwLnBKjVNmkrZ1ujChLalHp2MzKCWGCaAzuA3eD0wuCLW4K4m+E5RpflCKATtLoSeX8Zj0BVm09BVtx5awLtdUcqE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1578594902990218.32581348733004; Thu, 9 Jan 2020 10:35:02 -0800 (PST) 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-241-altm_pgCNzWZbu0Son8Ufg-1; Thu, 09 Jan 2020 13:34:22 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A565318A6ECA; Thu, 9 Jan 2020 18:34:14 +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 7BBFA272A6; Thu, 9 Jan 2020 18:34:14 +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 3ADA2503D0; Thu, 9 Jan 2020 18:34:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 009IY8td019853 for ; Thu, 9 Jan 2020 13:34:08 -0500 Received: by smtp.corp.redhat.com (Postfix) id 574AA13BBAE; Thu, 9 Jan 2020 18:34:08 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 51DBA13BBA8 for ; Thu, 9 Jan 2020 18:34:08 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 345548C092C for ; Thu, 9 Jan 2020 18:34:08 +0000 (UTC) Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-130-k9TUSzf3Ny6im9RbfQ7Q4w-1; Thu, 09 Jan 2020 13:34:06 -0500 Received: by mail-qt1-f196.google.com with SMTP id i13so1883136qtr.3 for ; Thu, 09 Jan 2020 10:34:05 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:541e:7a5e:37ad:989b:4530]) by smtp.gmail.com with ESMTPSA id g52sm3902267qta.58.2020.01.09.10.34.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:34:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578594901; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=lXlt3wJQwpWhR5t7PSAENuX2ZaUrH+WDcCioOYLbZGw=; b=htPRykEaw17G5pw80BQHZA4DaF9aa9gLnJhLQ25msbzEQ06Pfy+w46EDVU5lLi4kQ1qu3U ZVIfr/vrnMCUqc1ntF9mE4pj0tcnpgDX2p4RRS+sWpLp9ZcexmEw9aMH8If1DWGRTiUJ3q Ry9oVQqvCNEvqIN2P+JO29sAX9AZ/KU= 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=F4WPWcCHdw8NVKT2wwILojtBOCyMtA9uBSXU3WeMLDQ=; b=VG9PRbt3oyz34zDvOeKWDt9xMsZ1vFQjzEZ7xEQ0+T7rywH/CRts2eKoZMEv3sF+qb 7P5FpUM+4HvzSb1Dwry13yPpNjB/tJduYPsjpx++fYjCbRVJqFOxK+dNcCwMgGZctT61 n7qIS5al44TUQvMaempo+b/fvr5GKcajjxl1FBlXfKFugvp6uDUr1lZzH/x6dUwbxk91 KtS55ZN8KMtyw4J6WOh4kVjDWz1nhv0aGJqWvvee/qM2eE7juq2cyc8WAymxN+1qs2eN cBRnviatD31vh0dT9CH4pkDpY+igl/16xg7FLE5xYGlRFG02BKfhQrizwdLTkwQFRHY7 OtsA== X-Gm-Message-State: APjAAAVIlNsxA0SH9qq7Fa20bUCq7wFPZSCjHag4F2Tl+qd/hLo3Pa04 SKIGV4M8yC0hAlrL24ub9xzlOUpaSZg= X-Google-Smtp-Source: APXvYqx+LkvsZ055yHNu6b36SGMNIyRbdH6PI4QwhkZ2jWcdBfzi/y8147N6C04HOJA+u4aib6t8vQ== X-Received: by 2002:aed:2c03:: with SMTP id f3mr8998404qtd.80.1578594845391; Thu, 09 Jan 2020 10:34:05 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 15:33:47 -0300 Message-Id: <20200109183348.1362138-8-danielhb413@gmail.com> In-Reply-To: <20200109183348.1362138-1-danielhb413@gmail.com> References: <20200109183348.1362138-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: k9TUSzf3Ny6im9RbfQ7Q4w-1 X-MC-Unique: altm_pgCNzWZbu0Son8Ufg-1 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 009IY8td019853 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 7/8] qemu_domain.c: turn qemuDomainChrDefDropDefaultPath to void 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.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" qemuDomainChrDefDropDefaultPath() returns an int, but it's always returning 0. Callers are checking for result < 0 to run their cleanup code needlessly. Turn the function to 'void' and adjust the callers. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik and pushed. Sorry=20 --- src/qemu/qemu_domain.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 931554eeb6..153f5897bc 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8468,20 +8468,19 @@ qemuDomainDefaultNetModel(const virDomainDef *def, * This function clears the path for migration as well, so we need to clear * the path even if we are not storing it in the XML. */ -static int +static void qemuDomainChrDefDropDefaultPath(virDomainChrDefPtr chr, virQEMUDriverPtr driver) { g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virBuffer buf =3D VIR_BUFFER_INITIALIZER; g_autofree char *regexp =3D NULL; - int ret =3D -1; =20 if (chr->deviceType !=3D VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL || chr->targetType !=3D VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO || chr->source->type !=3D VIR_DOMAIN_CHR_TYPE_UNIX || !chr->source->data.nix.path) { - return 0; + return; } =20 cfg =3D virQEMUDriverGetConfig(driver); @@ -8494,9 +8493,6 @@ qemuDomainChrDefDropDefaultPath(virDomainChrDefPtr ch= r, =20 if (virStringMatch(chr->source->data.nix.path, regexp)) VIR_FREE(chr->source->data.nix.path); - - ret =3D 0; - return ret; } =20 =20 @@ -8758,8 +8754,7 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr, =20 /* clear auto generated unix socket path for inactive definitions */ if (parseFlags & VIR_DOMAIN_DEF_PARSE_INACTIVE) { - if (qemuDomainChrDefDropDefaultPath(chr, driver) < 0) - return -1; + qemuDomainChrDefDropDefaultPath(chr, driver); =20 /* For UNIX chardev if no path is provided we generate one. * This also implies that the mode is 'bind'. */ @@ -10118,10 +10113,8 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr dr= iver, } } =20 - for (i =3D 0; i < def->nchannels; i++) { - if (qemuDomainChrDefDropDefaultPath(def->channels[i], driver) = < 0) - goto cleanup; - } + for (i =3D 0; i < def->nchannels; i++) + qemuDomainChrDefDropDefaultPath(def->channels[i], driver); =20 for (i =3D 0; i < def->nserials; i++) { virDomainChrDefPtr serial =3D def->serials[i]; --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 26 11:40:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1578594869; cv=none; d=zohomail.com; s=zohoarc; b=Mtnl8fe1/bA3RppR7rvu1F/n0j/j2gcHgdc+vPjU3jKDzmU6uAQ3fW7Jk7EnbeU6wFDhsAyUx7qtakP4ZwIYsCJLH8EUFNnmW5qUZiAOJFV2ixNtsgZjUPFS7q/shV7hI506utnS8izzrfEp7WB/jkXckLepNLqVH9MXOeLdeCs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578594869; 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=8Zm6Zvs0p6g591MjyzPWOYEe4qGWkEl/fjdvtj1et64=; b=kG23K1jk73xvDKpXIjGeDtq1c3O9S9o5Clxq6yP1gdg3ROEg6eVsJtWFJtgXadiFZzj4jMhQ9nHh6TRH7MJ+lyERlHhTbPHx08yxkDFDwiolixYteYzzGtGODEgcHWMO1c8RP7geeoM6ijZfci2swj5r93OcomANusf3r9RZH5g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 157859486926813.972484897327604; Thu, 9 Jan 2020 10:34:29 -0800 (PST) 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-414-AKE0lpTTNauep6RZ-08CKg-1; Thu, 09 Jan 2020 13:34:25 -0500 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 2542B801E67; Thu, 9 Jan 2020 18:34:19 +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 EEEDC5DA2C; Thu, 9 Jan 2020 18:34:18 +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 A082B18089D8; Thu, 9 Jan 2020 18:34:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 009IY9XO019860 for ; Thu, 9 Jan 2020 13:34:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6586D13AF61; Thu, 9 Jan 2020 18:34:09 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 606E013BBAE for ; Thu, 9 Jan 2020 18:34:09 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 42064803015 for ; Thu, 9 Jan 2020 18:34:09 +0000 (UTC) Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-62-eNFFDrxGOFuQZ9U1oNmaKw-1; Thu, 09 Jan 2020 13:34:07 -0500 Received: by mail-qk1-f194.google.com with SMTP id a203so6957685qkc.3 for ; Thu, 09 Jan 2020 10:34:07 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:541e:7a5e:37ad:989b:4530]) by smtp.gmail.com with ESMTPSA id g52sm3902267qta.58.2020.01.09.10.34.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:34:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578594868; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=8Zm6Zvs0p6g591MjyzPWOYEe4qGWkEl/fjdvtj1et64=; b=J+aeh66GzcZzxFi5Yn2bNmX5TCZwFpA1b61VAu2U6xgHsz+1ucypxkTwSKNq/tA3mjHmyF edYF7wRcUJ+a9qXkOEWNi3BXWCsP87tWp6IxTial3tCsOUtqUiY9UFb57bVmMgMZzhnBNh j5RARo1jKMI8IYmfNhbLlpTGpTUXNZE= 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=8jdcM1BFg7SpO1VDkG9DCwz6Jy9XNotq5IiohhW1CDM=; b=OOhbvrmu9D+zHAZTHC6kp5wGKSk6PehFEftB/MARkGh+GCguPXKQ9+CPeWmmvf4jKd e8S8oI0Kfuz53l7KqWEnNGFPstLpXVx1Mb+1ST+i71bNmunxDQN6gm1pEihcfIFjcUDu Qv8eZivFnIAvP2DQsIT0BkfrQAbSEVWnNPPsJWzZ0v1fT1sfvfXxGtsUMNG++V6uUCvG LcuCo+R2vxIjHfXkDuaiCZNFHnG1Om8ef+MHIEYcldVwt6a7i3iNfOYuqXFWBFqNVuLL qC2+zDjDze6mD+C2IpKlJf/KkhaeCrR4H3SEBK76UndoDSGlQAhVm91c35rHArZUWcZx dCtg== X-Gm-Message-State: APjAAAUOmcv0wiCkST2mOJR0FpvFYlgNqEerWjDhsKoAZ/L/LXTxVWzE LgdYjuj133H9fpdoigUnWYYm7XOdIP0= X-Google-Smtp-Source: APXvYqyRYsE453JZVVs6ZqdDY4xe16bNSAOzYpMV5XOEzHxmLsSf9TOIT7L1LT2MgrWfxyf5qaCJZg== X-Received: by 2002:a37:664d:: with SMTP id a74mr10746132qkc.4.1578594846558; Thu, 09 Jan 2020 10:34:06 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 15:33:48 -0300 Message-Id: <20200109183348.1362138-9-danielhb413@gmail.com> In-Reply-To: <20200109183348.1362138-1-danielhb413@gmail.com> References: <20200109183348.1362138-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: eNFFDrxGOFuQZ9U1oNmaKw-1 X-MC-Unique: AKE0lpTTNauep6RZ-08CKg-1 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 009IY9XO019860 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 8/8] qemu_domain_address.c: turn qemuDomainFillDeviceIsolationGroup to void 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-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Starting on commit 1f43393283ff, qemuDomainFillDeviceIsolationGroup() returns 0 in all circunstances. Let's turn it to 'void' make it clearer that the function will not fail. This also spares a check for < 0 return in qemu_hotplug.c. The qemuDomainFillDeviceIsolationGroupIter() callback now returns 0 at all times - which is already happening anyway. Refer to 1f43393283ff commit message for more details on why the function was changed to never return an error. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik and pushed. Sorry=20 --- src/qemu/qemu_domain_address.c | 20 ++++++++++---------- src/qemu/qemu_domain_address.h | 2 +- src/qemu/qemu_hotplug.c | 6 ++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 9e3bcc434d..4fb9db1e14 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1252,7 +1252,7 @@ qemuDomainFindUnusedIsolationGroup(virDomainDefPtr de= f) * * Return: 0 on success, <0 on failure * */ -int +void qemuDomainFillDeviceIsolationGroup(virDomainDefPtr def, virDomainDeviceDefPtr dev) { @@ -1270,7 +1270,7 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr de= f, /* Only PCI host devices are subject to isolation */ if (hostdev->mode !=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || hostdev->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYP= E_PCI) { - return 0; + return; } =20 hostAddr =3D &hostdev->source.subsys.u.pci.addr; @@ -1278,7 +1278,7 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr de= f, /* If a non-default isolation has already been assigned to the * device, we can avoid looking up the information again */ if (info->isolationGroup > 0) - return 0; + return; =20 /* The isolation group depends on the IOMMU group assigned by the = host */ tmp =3D virPCIDeviceAddressGetIOMMUGroupNum(hostAddr); @@ -1288,7 +1288,7 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr de= f, "%04x:%02x:%02x.%x, device won't be isolated", hostAddr->domain, hostAddr->bus, hostAddr->slot, hostAddr->function); - return 0; + return; } =20 /* The isolation group for a host device is its IOMMU group, @@ -1314,13 +1314,13 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr = def, * require us to isolate the guest device, so we can skip them */ if (iface->type !=3D VIR_DOMAIN_NET_TYPE_NETWORK || virDomainNetResolveActualType(iface) !=3D VIR_DOMAIN_NET_TYPE_= HOSTDEV) { - return 0; + return; } =20 /* If a non-default isolation has already been assigned to the * device, we can avoid looking up the information again */ if (info->isolationGroup > 0) - return 0; + return; =20 /* Obtain a synthetic isolation group for the device, since at this * point in time we don't have access to the IOMMU group of the ho= st @@ -1332,7 +1332,7 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr de= f, "configured to use hostdev-backed network '%s', " "device won't be isolated", iface->data.network.name); - return 0; + return; } =20 info->isolationGroup =3D tmp; @@ -1341,8 +1341,6 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr de= f, "hostdev-backed network '%s' is %u", iface->data.network.name, info->isolationGroup); } - - return 0; } =20 =20 @@ -1364,7 +1362,9 @@ qemuDomainFillDeviceIsolationGroupIter(virDomainDefPt= r def, virDomainDeviceInfoPtr info G_GNUC_= UNUSED, void *opaque G_GNUC_UNUSED) { - return qemuDomainFillDeviceIsolationGroup(def, dev); + qemuDomainFillDeviceIsolationGroup(def, dev); + + return 0; } =20 =20 diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h index bf04e6bfdb..7ef3308246 100644 --- a/src/qemu/qemu_domain_address.h +++ b/src/qemu/qemu_domain_address.h @@ -49,7 +49,7 @@ int qemuDomainEnsurePCIAddress(virDomainObjPtr obj, virQEMUDriverPtr driver) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); =20 -int qemuDomainFillDeviceIsolationGroup(virDomainDefPtr def, +void qemuDomainFillDeviceIsolationGroup(virDomainDefPtr def, virDomainDeviceDefPtr dev) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); =20 diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 31d455505b..cb5d587940 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1598,11 +1598,9 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr drive= r, if (qemuAssignDeviceHostdevAlias(vm->def, &info->alias, -1) < 0) goto error; =20 - if (qemuDomainIsPSeries(vm->def)) { + if (qemuDomainIsPSeries(vm->def)) /* Isolation groups are only relevant for pSeries guests */ - if (qemuDomainFillDeviceIsolationGroup(vm->def, &dev) < 0) - goto error; - } + qemuDomainFillDeviceIsolationGroup(vm->def, &dev); =20 if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) goto error; --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list