From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305973; cv=none; d=zoho.com; s=zohoarc; b=K7b1IDWjofBLWBg6Uf8/fPuDcbf/Bgoh9kWszTvxZWH/aRqwiKtp9GMQOZPqeiuO3R595F8y0pZazGLaEJoBNf97g0uTrJYNhwhoIsgKDxW/hdXqysVb6Mizks1EUTb6kBAzTAZk42Vl9XZQjHaFTACWYF2WW4HRRyT49lwF+CI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305973; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=dAUlaPRxB+RbKnYa8GX2p15Wvfj34oMaWMOsoMZTKq0=; b=XGn/BH5qgVfzkdDO5f4hTRvTqE/rfB8xG2QpjPiQ0bbUW6RxhDqTQKRAE9f84+oBrLp5M/JUT2BCl3g8ZIlKFQNDBUbsmJqN46n/7v7bx/JdQpcOBUvjW0LmzgsC4c7yf2831Z7K/hxA5fANSwPGtUP0XydTeUO1WTkxyihRTzU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566305973458601.8718853447435; Tue, 20 Aug 2019 05:59:33 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 39FFD30603AA; Tue, 20 Aug 2019 12:59:32 +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 108A5453B; Tue, 20 Aug 2019 12:59:32 +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 C98652551F; Tue, 20 Aug 2019 12:59:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxNqM023114 for ; Tue, 20 Aug 2019 08:59:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id C55804274; Tue, 20 Aug 2019 12:59:23 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F0CE18B69 for ; Tue, 20 Aug 2019 12:59:23 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:00 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 01/19] qemuBuildSerialChrDeviceStr: rename cmd to buf X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 20 Aug 2019 12:59:32 +0000 (UTC) We usually use 'cmd' for a virCommand(Ptr) variable. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e3f4ef624b..98516d2627 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10867,7 +10867,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, virDomainChrDefPtr serial, virQEMUCapsPtr qemuCaps) { - virBuffer cmd =3D VIR_BUFFER_INITIALIZER; + virBuffer buf =3D VIR_BUFFER_INITIALIZER; virQEMUCapsFlags caps; =20 switch ((virDomainChrSerialTargetModel) serial->targetModel) { @@ -10901,21 +10901,21 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, goto error; } =20 - virBufferAsprintf(&cmd, "%s,chardev=3Dchar%s,id=3D%s", + virBufferAsprintf(&buf, "%s,chardev=3Dchar%s,id=3D%s", virDomainChrSerialTargetModelTypeToString(serial->ta= rgetModel), serial->info.alias, serial->info.alias); =20 - if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &serial->info, qemuCaps) < 0) goto error; =20 - if (virBufferCheckError(&cmd) < 0) + if (virBufferCheckError(&buf) < 0) goto error; =20 - *deviceStr =3D virBufferContentAndReset(&cmd); + *deviceStr =3D virBufferContentAndReset(&buf); return 0; =20 error: - virBufferFreeAndReset(&cmd); + virBufferFreeAndReset(&buf); return -1; } =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305976; cv=none; d=zoho.com; s=zohoarc; b=Xnarb4r20isMnObcMPOUqFFtJnhIZZ/eZHcP2CxoAjiQ3Aw+Y8ak+hMUG/1mr9wJXcRJaIOJjRYPzHZvDetj1a5i3muXihEbCjNJjLXYX0DMnCoHIWvvt042FBGlMCTMvS1ZkZSWaksc9Ybxoo9nsdFPG4XnbuawZkbFTh2MM3s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305976; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Kww7O/57ffZQNgBbJzsAkzW70yDTSQsmQepcyYO6thY=; b=NQmW/8j20X7AZIvbvWkqQ2pbF70yN7k1baBdz8fLBS53sOhW8993dINW9zn1OB2N0UPjcytR6y2bXYIgfayd0BMpsctYdkHfV0RBdYnB2BEcrGKLIV/J4CUaiH0Mog3vbiCDdS8gCzNG06CzJv3ZHv0SAgQ5t90eEMekFToAnMs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 156630597681322.729192423693917; Tue, 20 Aug 2019 05:59:36 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 75D30898101; Tue, 20 Aug 2019 12:59:35 +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 5184F17D58; Tue, 20 Aug 2019 12:59:35 +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 198E0180B536; Tue, 20 Aug 2019 12:59:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxOQY023127 for ; Tue, 20 Aug 2019 08:59:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9329987A1; Tue, 20 Aug 2019 12:59:24 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D17C4274 for ; Tue, 20 Aug 2019 12:59:23 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:01 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/19] qemuBuildNumaArgStr: split variable declarations X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Tue, 20 Aug 2019 12:59:35 +0000 (UTC) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 98516d2627..1b5cde6ec7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7881,7 +7881,9 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, size_t i, j; virQEMUCapsPtr qemuCaps =3D priv->qemuCaps; virBuffer buf =3D VIR_BUFFER_INITIALIZER; - char *cpumask =3D NULL, *tmpmask =3D NULL, *next =3D NULL; + char *cpumask =3D NULL; + char *tmpmask =3D NULL; + char *next =3D NULL; virBufferPtr nodeBackends =3D NULL; bool needBackend =3D false; int rc; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305970; cv=none; d=zoho.com; s=zohoarc; b=Fbrn6NLFSysa7Tb7BSMIit7pzHsdrC7fllgFJzVtzo3cTeJPo9uO1+jvluMLzk38I3tezSzkENHs3EK3rXxu+OqjKwH7DQSOFzqgBnF9T0sJUkul4flIPXxMZf8BflwVlnQaCJvXjRCKcFNDKDLseodl2SwisHEWmuQK6NCA1MM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305970; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=cpqO296sHzjN9gZk/82WeT2iTiWTptnXBEf/T3ke7iE=; b=opDnpJyuHvKZuhtxXMMkp/pM3dPpivP+nLAPFh7RNoz6GOGOlT3cWEFPWIhW7aGBXnBj+3IhwPoEoXueEM5L6wq8WTo28TehaZDJP+DGV8Z/x+NlkJDM7ft/Lq4TNByyZ6IzKbSXlaltUE+x/PXCVQHc+xbUKQ1qH0rtQ7BrJsM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566305970879444.211095805147; Tue, 20 Aug 2019 05:59:30 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 9BFD630A5A64; Tue, 20 Aug 2019 12:59:29 +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 78E7C18139; Tue, 20 Aug 2019 12:59:29 +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 397BE2551E; Tue, 20 Aug 2019 12:59:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxPTw023132 for ; Tue, 20 Aug 2019 08:59:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 642C818EE4; Tue, 20 Aug 2019 12:59:25 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E212787A1 for ; Tue, 20 Aug 2019 12:59:24 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:02 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 03/19] qemuBuildHotpluggableCPUProps: use VIR_RETURN_PTR X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 20 Aug 2019 12:59:30 +0000 (UTC) This lets us get rid of the error label. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1b5cde6ec7..5e05916b23 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -11047,33 +11047,29 @@ virJSONValuePtr qemuBuildHotpluggableCPUProps(const virDomainVcpuDef *vcpu) { qemuDomainVcpuPrivatePtr vcpupriv =3D QEMU_DOMAIN_VCPU_PRIVATE(vcpu); - virJSONValuePtr ret =3D NULL; + VIR_AUTOPTR(virJSONValue) ret =3D NULL; =20 if (virJSONValueObjectCreate(&ret, "s:driver", vcpupriv->type, "s:id", vcpupriv->alias, NULL) < 0) - goto error; + return NULL; =20 if (vcpupriv->socket_id !=3D -1 && virJSONValueObjectAdd(ret, "i:socket-id", vcpupriv->socket_id, NUL= L) < 0) - goto error; + return NULL; =20 if (vcpupriv->core_id !=3D -1 && virJSONValueObjectAdd(ret, "i:core-id", vcpupriv->core_id, NULL) <= 0) - goto error; + return NULL; =20 if (vcpupriv->thread_id !=3D -1 && virJSONValueObjectAdd(ret, "i:thread-id", vcpupriv->thread_id, NUL= L) < 0) - goto error; + return NULL; =20 if (vcpupriv->node_id !=3D -1 && virJSONValueObjectAdd(ret, "i:node-id", vcpupriv->node_id, NULL) <= 0) - goto error; - - return ret; + return NULL; =20 - error: - virJSONValueFree(ret); - return NULL; + VIR_RETURN_PTR(ret); } =20 =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305969; cv=none; d=zoho.com; s=zohoarc; b=UeqxyUi9KxmfZaJsrKNmcRB++WXbosw6PLfefemNGO6OnPq3aeshFHj/FOPfjW6zKrUy97KZUmBFVMyuSsUD5Dx/GBKmYyvEtFnMSP0c3C9G8oUB/wY1SwqJ80KwCKWcRxJkJrO/hJNlEy7p/i3tjjNSt2BNVn1yZsnz1J8hWhc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305969; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=vIsS7WEx23SxOVbhPpz5rCzYptOGE5RV0/h2blcIa9o=; b=Ms0vZ0LV9E18chS7gWzbtkfb92JVsvGEgyXtE6MenxJldYoUKdlKr1l8X1+1U3DBn1PvVQvy0Mw0FCdUYvlrZ1BJEM0nDzizS3bGSIlNxbizXoih6w9u86nuMKzPcjeASkWcQpiptYlXPVpakSbauisKJhK2GijKsk/a40YEAnQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566305969914751.0384109660152; Tue, 20 Aug 2019 05:59:29 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8A35F8CF1A3; Tue, 20 Aug 2019 12:59:28 +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 667AD13836; Tue, 20 Aug 2019 12:59:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E4A37180B536; Tue, 20 Aug 2019 12:59:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxQt9023143 for ; Tue, 20 Aug 2019 08:59:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 347FF18EEA; Tue, 20 Aug 2019 12:59:26 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B19164274 for ; Tue, 20 Aug 2019 12:59:25 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:03 +0200 Message-Id: <42b53a55fd615ce5d5d410cb75402256804c6bb7.1566305923.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/19] qemuxml2xmltest: switch TPM tests to use latest caps X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Tue, 20 Aug 2019 12:59:29 +0000 (UTC) In preparation to moving the validation to the parser, we need to supply the correct caps. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- ...enc.xml =3D> tpm-emulator-tpm2-enc.x86_64-latest.xml} | 4 ++-- ...or-tpm2.xml =3D> tpm-emulator-tpm2.x86_64-latest.xml} | 4 ++-- ...tpm-emulator.xml =3D> tpm-emulator.x86_64-latest.xml} | 4 ++-- ...h-crb.xml =3D> tpm-passthrough-crb.x86_64-latest.xml} | 4 ++-- ...ssthrough.xml =3D> tpm-passthrough.x86_64-latest.xml} | 4 ++-- tests/qemuxml2xmltest.c | 10 +++++----- 6 files changed, 15 insertions(+), 15 deletions(-) rename tests/qemuxml2xmloutdata/{tpm-emulator-tpm2-enc.xml =3D> tpm-emulat= or-tpm2-enc.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{tpm-emulator-tpm2.xml =3D> tpm-emulator-t= pm2.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{tpm-emulator.xml =3D> tpm-emulator.x86_64= -latest.xml} (89%) rename tests/qemuxml2xmloutdata/{tpm-passthrough-crb.xml =3D> tpm-passthro= ugh-crb.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{tpm-passthrough.xml =3D> tpm-passthrough.= x86_64-latest.xml} (89%) diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.xml b/tests/qem= uxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.xml rename to tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml index 8902725097..dcd504310f 100644 --- a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.xml +++ b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml @@ -18,7 +18,7 @@ destroy /usr/bin/qemu-system-x86_64 - +
@@ -30,7 +30,7 @@ -
+
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml b/tests/qemuxml= 2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml rename to tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml index d30944c23d..625aaa5f60 100644 --- a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml +++ b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml @@ -18,7 +18,7 @@ destroy /usr/bin/qemu-system-x86_64 - +
@@ -28,7 +28,7 @@ -
+
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator.xml b/tests/qemuxml2xmlo= utdata/tpm-emulator.x86_64-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/tpm-emulator.xml rename to tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml index ec33402499..002af76c21 100644 --- a/tests/qemuxml2xmloutdata/tpm-emulator.xml +++ b/tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml @@ -18,7 +18,7 @@ destroy /usr/bin/qemu-system-x86_64 - +
@@ -28,7 +28,7 @@ -
+
diff --git a/tests/qemuxml2xmloutdata/tpm-passthrough-crb.xml b/tests/qemux= ml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/tpm-passthrough-crb.xml rename to tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml index 67ada46846..ef68c2d0d7 100644 --- a/tests/qemuxml2xmloutdata/tpm-passthrough-crb.xml +++ b/tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml @@ -18,7 +18,7 @@ destroy /usr/bin/qemu-system-x86_64 - +
@@ -30,7 +30,7 @@ -
+
diff --git a/tests/qemuxml2xmloutdata/tpm-passthrough.xml b/tests/qemuxml2x= mloutdata/tpm-passthrough.x86_64-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/tpm-passthrough.xml rename to tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml index 8f9eca054d..2a99f35cf8 100644 --- a/tests/qemuxml2xmloutdata/tpm-passthrough.xml +++ b/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml @@ -18,7 +18,7 @@ destroy /usr/bin/qemu-system-x86_64 - +
@@ -30,7 +30,7 @@ -
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index d7850a89d3..e4e426c99b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -664,11 +664,11 @@ mymain(void) DO_TEST("numad-auto-memory-vcpu-cpuset", NONE); DO_TEST("usb-ich9-ehci-addr", NONE); DO_TEST("disk-copy_on_read", NONE); - DO_TEST("tpm-passthrough", NONE); - DO_TEST("tpm-passthrough-crb", NONE); - DO_TEST("tpm-emulator", NONE); - DO_TEST("tpm-emulator-tpm2", NONE); - DO_TEST("tpm-emulator-tpm2-enc", NONE); + DO_TEST_CAPS_LATEST("tpm-passthrough"); + DO_TEST_CAPS_LATEST("tpm-passthrough-crb"); + DO_TEST_CAPS_LATEST("tpm-emulator"); + DO_TEST_CAPS_LATEST("tpm-emulator-tpm2"); + DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-enc"); =20 DO_TEST("metadata", NONE); DO_TEST("metadata-duplicate", NONE); --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305974; cv=none; d=zoho.com; s=zohoarc; b=G1w2ank2X38zierdpV1jKgVy3mMbOuqyFp5vycWCrnGmdmQFZn/D//q/XB+F0QuPQ2xajXt3OhKmKkDpLK4a0cn+kkWrSwCqyD6VNV9L2OBnAINUgPL8mBtLPp8SB7cvIA81YWmDdW7FRDgbiMjjS1bTugocgcg+hDr7Y/oO/jI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305974; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ATQnyY9/XX9wmqscaofFnAli24JJ9L+3Ltbx95HST1c=; b=l0iZx3s0Sz1aVNojDuk2ZP7EZuaZ4ronFvSoM+wJEhXYpoe82j//NzVI62sS69bojOI0Dbugk4H3oL2BU9QL4jMVa0W/ViJ9cevfTJ08NnFToImHqX7R5qJv5I8mly1q3J4mi8T5GqjMhKOmW2EFTZJdO9g18iONwbtGVzR2ibQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 156630597462445.94287202297721; Tue, 20 Aug 2019 05:59:34 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4E419A35FE8; Tue, 20 Aug 2019 12:59:33 +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 2504A13836; Tue, 20 Aug 2019 12:59:33 +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 D988A24F68; Tue, 20 Aug 2019 12:59:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxRct023152 for ; Tue, 20 Aug 2019 08:59:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 059CB13836; Tue, 20 Aug 2019 12:59:27 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 825E718EE4 for ; Tue, 20 Aug 2019 12:59:26 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:04 +0200 Message-Id: <74c2d6f219da7b114fa2ed189e3b018bbd1534ad.1566305923.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 05/19] qemu: move TPM vaildation to qemuDomainDeviceDefValidateTPM X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Tue, 20 Aug 2019 12:59:33 +0000 (UTC) Simplify the command line formatter by complicating the validator. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 15 +-------------- src/qemu/qemu_domain.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5e05916b23..3a4acb3166 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10004,7 +10004,6 @@ qemuBuildTPMOpenBackendFDs(const char *tpmdev, static char * qemuBuildTPMBackendStr(const virDomainDef *def, virCommandPtr cmd, - virQEMUCapsPtr qemuCaps, int *tpmfd, int *cancelfd, char **chardev) @@ -10033,9 +10032,6 @@ qemuBuildTPMBackendStr(const virDomainDef *def, =20 switch (tpm->type) { case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH)) - goto no_support; - tpmdev =3D tpm->data.passthrough.source.data.file.path; if (!(cancel_path =3D virTPMCreateCancelPath(tpmdev))) goto error; @@ -10062,9 +10058,6 @@ qemuBuildTPMBackendStr(const virDomainDef *def, =20 break; case VIR_DOMAIN_TPM_TYPE_EMULATOR: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_EMULATOR)) - goto no_support; - virBufferAddLit(&buf, ",chardev=3Dchrtpm"); =20 if (virAsprintf(chardev, "socket,id=3Dchrtpm,path=3D%s", @@ -10081,12 +10074,6 @@ qemuBuildTPMBackendStr(const virDomainDef *def, =20 return virBufferContentAndReset(&buf); =20 - no_support: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("The QEMU executable %s does not support TPM " - "backend type %s"), - def->emulator, type); - error: VIR_FREE(devset); VIR_FREE(cancel_path); @@ -10110,7 +10097,7 @@ qemuBuildTPMCommandLine(virCommandPtr cmd, if (!def->tpm) return 0; =20 - if (!(optstr =3D qemuBuildTPMBackendStr(def, cmd, qemuCaps, + if (!(optstr =3D qemuBuildTPMBackendStr(def, cmd, &tpmfd, &cancelfd, &chardev))) return -1; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a06672333c..e34d03191d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6384,7 +6384,8 @@ qemuDomainDeviceDefValidateVsock(const virDomainVsock= Def *vsock, =20 static int qemuDomainDeviceDefValidateTPM(virDomainTPMDef *tpm, - const virDomainDef *def ATTRIBUTE_UNUSED) + const virDomainDef *def, + virQEMUCapsPtr qemuCaps) { /* TPM 1.2 and 2 are not compatible, so we choose a specific version h= ere */ if (tpm->version =3D=3D VIR_DOMAIN_TPM_VERSION_DEFAULT) @@ -6406,7 +6407,31 @@ qemuDomainDeviceDefValidateTPM(virDomainTPMDef *tpm, case VIR_DOMAIN_TPM_VERSION_LAST: break; } + + switch (tpm->type) { + case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH)) + goto no_support; + break; + + case VIR_DOMAIN_TPM_TYPE_EMULATOR: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_EMULATOR)) + goto no_support; + + break; + case VIR_DOMAIN_TPM_TYPE_LAST: + break; + } + return 0; + + no_support: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("The QEMU executable %s does not support TPM " + "backend type %s"), + def->emulator, + virDomainTPMBackendTypeToString(tpm->type)); + return -1; } =20 =20 @@ -6847,7 +6872,7 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef = *dev, break; =20 case VIR_DOMAIN_DEVICE_TPM: - ret =3D qemuDomainDeviceDefValidateTPM(dev->data.tpm, def); + ret =3D qemuDomainDeviceDefValidateTPM(dev->data.tpm, def, qemuCap= s); break; =20 case VIR_DOMAIN_DEVICE_GRAPHICS: --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305974; cv=none; d=zoho.com; s=zohoarc; b=PD2+EPR/yl/d5IUuGC7wR5Ny8GZKIaY9dQBwE7OjeJI4eO3o9Qk0zI7JaivPmmxAyNhGiJyhuEk6OLsSz12Fcbr0pjylPxA6Wmp2r+Uiy0IiKr0KtofebDQ2CLZgD2CjoHfnGbPGB5NlVAR3JsVd5Dm2/BoimPoIoVrH26DpyPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305974; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=wJ0FwBd3D7IuC1Qhp6knlweu9YkdNJ6CqSSuPMtSGyM=; b=LGNkTFh358tslzD8OOv+nljOjHPQ2o3KFwqYPAMUO83U/SgLMFKvBoGTJJz5Jm3pJETHWKUFUd1O1cYWdD2WpeON2xFO/EoDbmxRO7oeKhC7WVWbBsJn2Fk/3Y7xZ9j2frXpU9DTi/u0gsXjevaD2u/0TOMxJUin5fMdvAPphxM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566305974791981.2622928487531; Tue, 20 Aug 2019 05:59:34 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9814B898107; Tue, 20 Aug 2019 12:59:33 +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 6F83618EEF; Tue, 20 Aug 2019 12:59:33 +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 34FEE24F31; Tue, 20 Aug 2019 12:59:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxRsB023159 for ; Tue, 20 Aug 2019 08:59:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id C765C13836; Tue, 20 Aug 2019 12:59:27 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 516EF87A1 for ; Tue, 20 Aug 2019 12:59:27 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:05 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 06/19] qemuBuildTPMBackendStr: format device and alias separately X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Tue, 20 Aug 2019 12:59:34 +0000 (UTC) Also get rid of the temporary 'type' variable. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3a4acb3166..60e00042c7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10010,7 +10010,6 @@ qemuBuildTPMBackendStr(const virDomainDef *def, { const virDomainTPMDef *tpm =3D def->tpm; virBuffer buf =3D VIR_BUFFER_INITIALIZER; - const char *type =3D NULL; char *cancel_path =3D NULL; char *devset =3D NULL; char *cancelset =3D NULL; @@ -10019,16 +10018,8 @@ qemuBuildTPMBackendStr(const virDomainDef *def, *tpmfd =3D -1; *cancelfd =3D -1; =20 - switch (tpm->type) { - case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: - case VIR_DOMAIN_TPM_TYPE_EMULATOR: - type =3D virDomainTPMBackendTypeToString(tpm->type); - break; - case VIR_DOMAIN_TPM_TYPE_LAST: - goto error; - } - - virBufferAsprintf(&buf, "%s,id=3Dtpm-%s", type, tpm->info.alias); + virBufferAsprintf(&buf, "%s", virDomainTPMBackendTypeToString(tpm->typ= e)); + virBufferAsprintf(&buf, ",id=3Dtpm-%s", tpm->info.alias); =20 switch (tpm->type) { case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305977; cv=none; d=zoho.com; s=zohoarc; b=ZPgZ3sC8OM0FjHI3VAT38CVdmWlNzjH7MT6jjqQ7xeiSFLlZA/tw1lUgngPQsU4X5no+KUyojU4A96QQaw3SIBIHEn4WpbBBwCp40ll9u1cIcYW/3dueJzwIiq0YqQItUT2X9WXeP0qtk1ppL38peQaL9ascyjN1w1pDkFcDm6o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305977; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=aJUhGMzstlMdgRHWkBDye64+jGJ78JzUdktuUbff+Jc=; b=b8Zg1qmefEtodvWSr9t5UijLUmt2vrRx2/MKYYuANplCV9kFt/wM9RiZJjuBzekKx0auUT3KpP9rYeksPkC0YVzl33cpv4yuXDRoEgzDYu89XqspTHL0S/5d89saaaxvXkrGfcj6VOfSCLJaGu70TbsIVanyBAwEoxViebeVODE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566305977734118.98130074845176; Tue, 20 Aug 2019 05:59:37 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 97CE43091786; Tue, 20 Aug 2019 12:59:36 +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 6F0C3179C4; Tue, 20 Aug 2019 12:59:36 +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 30D6E180BA9B; Tue, 20 Aug 2019 12:59:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxS4M023171 for ; Tue, 20 Aug 2019 08:59:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id E276F18EEF; Tue, 20 Aug 2019 12:59:28 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 208B887A1 for ; Tue, 20 Aug 2019 12:59:27 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:06 +0200 Message-Id: <3c47efc20e467fd3dd583ce91b8793d4ef099814.1566305923.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 07/19] qemu_command: switch to VIR_AUTOCLEAN for virBuffer X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 20 Aug 2019 12:59:37 +0000 (UTC) Simplify the code by annotating all the temporary virBuffers with VIR_AUTOCLEAN. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 194 ++++++++++++++-------------------------- 1 file changed, 67 insertions(+), 127 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 60e00042c7..94a6ad546e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -205,7 +205,7 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd, int ret =3D -1; char *alias =3D NULL; char *path =3D NULL; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 /* If the -object secret does not exist, then just return. This just * means the domain won't be able to use a secret master key and is @@ -235,7 +235,6 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd, ret =3D 0; =20 cleanup: - virBufferFreeAndReset(&buf); VIR_FREE(alias); VIR_FREE(path); return ret; @@ -737,7 +736,7 @@ static int qemuBuildObjectSecretCommandLine(virCommandPtr cmd, qemuDomainSecretInfoPtr secinfo) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; virJSONValuePtr props =3D NULL; =20 @@ -753,7 +752,6 @@ qemuBuildObjectSecretCommandLine(virCommandPtr cmd, ret =3D 0; =20 cleanup: - virBufferFreeAndReset(&buf); virJSONValueFree(props); return ret; } @@ -935,7 +933,7 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd, const char *alias, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; virJSONValuePtr props =3D NULL; =20 @@ -952,7 +950,6 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd, ret =3D 0; =20 cleanup: - virBufferFreeAndReset(&buf); virJSONValueFree(props); return ret; } @@ -988,7 +985,7 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, qemuDomainSecretInfoPtr secinfo) { char *ret =3D NULL; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t i; =20 switch ((virStorageNetProtocol) src->protocol) { @@ -1141,7 +1138,6 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, } =20 cleanup: - virBufferFreeAndReset(&buf); =20 return ret; } @@ -1838,7 +1834,7 @@ static char * qemuBuildDriveStr(virDomainDiskDefPtr disk, virQEMUCapsPtr qemuCaps) { - virBuffer opt =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; int detect_zeroes =3D virDomainDiskGetDetectZeroesMode(disk->discard, disk->detect_zero= es); =20 @@ -1922,7 +1918,6 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, return virBufferContentAndReset(&opt); =20 error: - virBufferFreeAndReset(&opt); return NULL; } =20 @@ -2005,7 +2000,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, unsigned int bootindex, virQEMUCapsPtr qemuCaps) { - virBuffer opt =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; const char *bus =3D virDomainDiskQEMUBusTypeToString(disk->bus); const char *contAlias; char *backendAlias =3D NULL; @@ -2343,14 +2338,13 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, =20 error: VIR_FREE(backendAlias); - virBufferFreeAndReset(&opt); return NULL; } =20 char * qemuBuildZPCIDevStr(virDomainDeviceInfoPtr dev) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 virBufferAsprintf(&buf, "zpci,uid=3D%u,fid=3D%u,target=3D%s,id=3Dzpci%u", @@ -2359,10 +2353,8 @@ qemuBuildZPCIDevStr(virDomainDeviceInfoPtr dev) dev->alias, dev->addr.pci.zpci.uid); =20 - if (virBufferCheckError(&buf) < 0) { - virBufferFreeAndReset(&buf); + if (virBufferCheckError(&buf) < 0) return NULL; - } =20 return virBufferContentAndReset(&buf); } @@ -2405,7 +2397,7 @@ qemuBuildFloppyCommandLineControllerOptions(virComman= dPtr cmd, virQEMUCapsPtr qemuCaps, unsigned int bootFloppy) { - virBuffer fdc_opts =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) fdc_opts =3D VIR_BUFFER_INITIALIZER; bool explicitfdc =3D qemuDomainNeedsFDC(def); bool hasfloppy =3D false; unsigned int bootindex; @@ -2485,7 +2477,6 @@ qemuBuildFloppyCommandLineControllerOptions(virComman= dPtr cmd, VIR_FREE(backendAlias); VIR_FREE(backendStr); VIR_FREE(bootindexStr); - virBufferFreeAndReset(&fdc_opts); return ret; } =20 @@ -2494,15 +2485,13 @@ static int qemuBuildObjectCommandline(virCommandPtr cmd, virJSONValuePtr objProps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!objProps) return 0; =20 - if (virQEMUBuildObjectCommandlineFromJSON(&buf, objProps) < 0) { - virBufferFreeAndReset(&buf); + if (virQEMUBuildObjectCommandlineFromJSON(&buf, objProps) < 0) return -1; - } =20 virCommandAddArg(cmd, "-object"); virCommandAddArgBuffer(cmd, &buf); @@ -2939,7 +2928,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, virQEMUCapsPtr qemuCaps, char **devstr) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 *devstr =3D NULL; =20 @@ -3123,7 +3112,6 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, return 0; =20 error: - virBufferFreeAndReset(&buf); return -1; } =20 @@ -3749,7 +3737,7 @@ char * qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem, qemuDomainObjPrivatePtr priv) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *device; =20 if (!mem->info.alias) { @@ -3835,7 +3823,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, size_t vhostfdSize, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; bool usingVirtio =3D false; char macaddr[VIR_MAC_STRING_BUFLEN]; =20 @@ -3996,7 +3984,6 @@ qemuBuildNicDevStr(virDomainDefPtr def, return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -4010,7 +3997,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, size_t vhostfdSize) { bool is_tap =3D false; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virDomainNetType netType =3D virDomainNetGetActualType(net); virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); size_t i; @@ -4145,7 +4132,6 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, =20 ret =3D virBufferContentAndReset(&buf); cleanup: - virBufferFreeAndReset(&buf); virObjectUnref(cfg); VIR_FREE(addr); return ret; @@ -4157,7 +4143,7 @@ qemuBuildWatchdogDevStr(const virDomainDef *def, virDomainWatchdogDefPtr dev, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 const char *model =3D virDomainWatchdogModelTypeToString(dev->model); if (!model) { @@ -4176,7 +4162,6 @@ qemuBuildWatchdogDevStr(const virDomainDef *def, return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -4230,7 +4215,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!virDomainDefHasMemballoon(def)) return 0; @@ -4261,7 +4246,6 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, return 0; =20 error: - virBufferFreeAndReset(&buf); return -1; } =20 @@ -4269,7 +4253,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, static char * qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (dev->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && dev->info.addr.spaprvio.has_reg) { @@ -4287,7 +4271,6 @@ qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev) return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -4330,7 +4313,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, virDomainInputDefPtr dev, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 switch ((virDomainInputType)dev->type) { case VIR_DOMAIN_INPUT_TYPE_MOUSE: @@ -4382,7 +4365,6 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -4391,7 +4373,7 @@ qemuBuildUSBInputDevStr(const virDomainDef *def, virDomainInputDefPtr dev, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 switch (dev->type) { case VIR_DOMAIN_INPUT_TYPE_MOUSE: @@ -4420,7 +4402,6 @@ qemuBuildUSBInputDevStr(const virDomainDef *def, return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -4480,7 +4461,7 @@ qemuBuildSoundDevStr(const virDomainDef *def, virDomainSoundDefPtr sound, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *model =3D NULL; =20 /* Hack for devices with different names in QEMU and libvirt */ @@ -4533,7 +4514,6 @@ qemuBuildSoundDevStr(const virDomainDef *def, return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -4559,7 +4539,7 @@ qemuBuildSoundCodecStr(virDomainSoundDefPtr sound, virDomainSoundCodecDefPtr codec, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *stype; int type, flags; =20 @@ -4579,7 +4559,6 @@ qemuBuildSoundCodecStr(virDomainSoundDefPtr sound, return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -4653,7 +4632,7 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, virDomainVideoDefPtr video, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *model; =20 /* We try to chose the best model for primary video device by preferri= ng @@ -4741,7 +4720,6 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -4907,7 +4885,7 @@ qemuBuildPCIHostdevDevStr(const virDomainDef *def, const char *configfd, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysPCIPtr pcisrc =3D &dev->source.subsys.u.pci; int backend =3D pcisrc->backend; =20 @@ -4955,7 +4933,6 @@ qemuBuildPCIHostdevDevStr(const virDomainDef *def, return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -4965,7 +4942,7 @@ qemuBuildUSBHostdevDevStr(const virDomainDef *def, virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysUSBPtr usbsrc =3D &dev->source.subsys.u.usb; =20 if (!dev->missing && !usbsrc->bus && !usbsrc->device) { @@ -4992,7 +4969,6 @@ qemuBuildUSBHostdevDevStr(const virDomainDef *def, return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -5002,7 +4978,7 @@ qemuBuildHubDevStr(const virDomainDef *def, virDomainHubDefPtr dev, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (dev->type !=3D VIR_DOMAIN_HUB_TYPE_USB) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -5028,7 +5004,6 @@ qemuBuildHubDevStr(const virDomainDef *def, return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -5073,7 +5048,7 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPt= r dev, virQEMUCapsPtr qemuCaps) { char *ret =3D NULL; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *netsource =3D NULL; virJSONValuePtr srcprops =3D NULL; virDomainHostdevSubsysSCSIPtr scsisrc =3D &dev->source.subsys.u.scsi; @@ -5105,7 +5080,6 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPt= r dev, cleanup: VIR_FREE(netsource); virJSONValueFree(srcprops); - virBufferFreeAndReset(&buf); return ret; } =20 @@ -5115,7 +5089,7 @@ qemuBuildSCSIVHostHostdevDevStr(const virDomainDef *d= ef, virQEMUCapsPtr qemuCaps, char *vhostfdName) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysSCSIVHostPtr hostsrc =3D &dev->source.subsys.u.s= csi_host; =20 if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VHOST_SCSI)) { @@ -5143,7 +5117,6 @@ qemuBuildSCSIVHostHostdevDevStr(const virDomainDef *d= ef, return virBufferContentAndReset(&buf); =20 cleanup: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -5151,7 +5124,7 @@ char * qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *source =3D NULL; char *drivealias =3D NULL; virDomainHostdevSubsysSCSIPtr scsisrc =3D &dev->source.subsys.u.scsi; @@ -5180,7 +5153,6 @@ qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, =20 return virBufferContentAndReset(&buf); error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -5188,7 +5160,7 @@ char * qemuBuildSCSIHostdevDevStr(const virDomainDef *def, virDomainHostdevDefPtr dev) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; int model =3D -1; char *driveAlias; const char *contAlias; @@ -5245,7 +5217,6 @@ qemuBuildSCSIHostdevDevStr(const virDomainDef *def, =20 return virBufferContentAndReset(&buf); error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -5390,7 +5361,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, unsigned int flags) { qemuDomainChrSourcePrivatePtr chrSourcePriv =3D QEMU_DOMAIN_CHR_SOURCE= _PRIVATE(dev); - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; bool telnet; char *charAlias =3D NULL; char *ret =3D NULL; @@ -5581,7 +5552,6 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, ret =3D virBufferContentAndReset(&buf); cleanup: VIR_FREE(charAlias); - virBufferFreeAndReset(&buf); return ret; } =20 @@ -5590,7 +5560,7 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *de= f, virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysMediatedDevPtr mdevsrc =3D &dev->source.subsys.u= .mdev; char *ret =3D NULL; char *mdevPath =3D NULL; @@ -5621,7 +5591,6 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *de= f, =20 cleanup: VIR_FREE(mdevPath); - virBufferFreeAndReset(&buf); return ret; } =20 @@ -5865,7 +5834,7 @@ static char * qemuBuildVirtioSerialPortDevStr(const virDomainDef *def, virDomainChrDefPtr dev) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *contAlias; =20 switch (dev->deviceType) { @@ -5925,14 +5894,13 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef = *def, return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 static char * qemuBuildSclpDevStr(virDomainChrDefPtr dev) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; if (dev->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE) { switch (dev->targetType) { case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP: @@ -5955,7 +5923,6 @@ qemuBuildSclpDevStr(virDomainChrDefPtr dev) return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -6064,7 +6031,7 @@ qemuBuildRNGDevStr(const virDomainDef *def, virDomainRNGDefPtr dev, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!qemuDomainCheckCCWS390AddressSupport(def, &dev->info, qemuCaps, dev->source.file)) @@ -6097,7 +6064,6 @@ qemuBuildRNGDevStr(const virDomainDef *def, return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -6166,7 +6132,7 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager, static char * qemuBuildSmbiosBiosStr(virSysinfoBIOSDefPtr def) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!def) return NULL; @@ -6202,7 +6168,7 @@ static char * qemuBuildSmbiosSystemStr(virSysinfoSystemDefPtr def, bool skip_uuid) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!def || (!def->manufacturer && !def->product && !def->version && @@ -6255,7 +6221,7 @@ qemuBuildSmbiosSystemStr(virSysinfoSystemDefPtr def, static char * qemuBuildSmbiosBaseBoardStr(virSysinfoBaseBoardDefPtr def) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!def) return NULL; @@ -6297,7 +6263,6 @@ qemuBuildSmbiosBaseBoardStr(virSysinfoBaseBoardDefPtr= def) return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -6305,7 +6270,7 @@ qemuBuildSmbiosBaseBoardStr(virSysinfoBaseBoardDefPtr= def) static char * qemuBuildSmbiosOEMStringsStr(virSysinfoOEMStringsDefPtr def) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t i; =20 if (!def) @@ -6325,7 +6290,7 @@ qemuBuildSmbiosOEMStringsStr(virSysinfoOEMStringsDefP= tr def) static char * qemuBuildSmbiosChassisStr(virSysinfoChassisDefPtr def) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!def) return NULL; @@ -6362,7 +6327,6 @@ qemuBuildSmbiosChassisStr(virSysinfoChassisDefPtr def) return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -6454,7 +6418,7 @@ qemuBuildVMGenIDCommandLine(virCommandPtr cmd, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - virBuffer opts =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) opts =3D VIR_BUFFER_INITIALIZER; char guid[VIR_UUID_STRING_BUFLEN]; =20 if (!def->genidRequested) @@ -6505,7 +6469,7 @@ static char * qemuBuildClockArgStr(virDomainClockDefPtr def) { size_t i; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 switch (def->offset) { case VIR_DOMAIN_CLOCK_OFFSET_UTC: @@ -6616,7 +6580,6 @@ qemuBuildClockArgStr(virDomainClockDefPtr def) return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -6791,7 +6754,7 @@ qemuBuildBootCommandLine(virCommandPtr cmd, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - virBuffer boot_buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) boot_buf =3D VIR_BUFFER_INITIALIZER; char *boot_opts_str =3D NULL; =20 if (def->os.bootmenu) { @@ -6860,7 +6823,6 @@ qemuBuildBootCommandLine(virCommandPtr cmd, =20 error: VIR_FREE(boot_opts_str); - virBufferFreeAndReset(&boot_buf); return -1; } =20 @@ -7095,8 +7057,8 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, virArch hostarch =3D virArchFromHost(); char *cpu =3D NULL, *cpu_flags =3D NULL; int ret =3D -1; - virBuffer cpu_buf =3D VIR_BUFFER_INITIALIZER; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) cpu_buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t i; =20 if (def->cpu && @@ -7307,8 +7269,6 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, cleanup: VIR_FREE(cpu); VIR_FREE(cpu_flags); - virBufferFreeAndReset(&buf); - virBufferFreeAndReset(&cpu_buf); return ret; } =20 @@ -7380,7 +7340,7 @@ qemuBuildNameCommandLine(virCommandPtr cmd, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 virCommandAddArg(cmd, "-name"); =20 @@ -7410,7 +7370,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virTristateSwitch vmport =3D def->features[VIR_DOMAIN_FEATURE_VMPORT]; virTristateSwitch smm =3D def->features[VIR_DOMAIN_FEATURE_SMM]; virCPUDefPtr cpu =3D def->cpu; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t i; int ret =3D -1; =20 @@ -7690,7 +7650,6 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, =20 ret =3D 0; cleanup: - virBufferFreeAndReset(&buf); return ret; } =20 @@ -7715,7 +7674,7 @@ qemuBuildSmpCommandLine(virCommandPtr cmd, virDomainDefPtr def) { char *smp; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; unsigned int maxvcpus =3D virDomainDefGetVcpusMax(def); unsigned int nvcpus =3D 0; virDomainVcpuDefPtr vcpu; @@ -7880,7 +7839,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, { size_t i, j; virQEMUCapsPtr qemuCaps =3D priv->qemuCaps; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *cpumask =3D NULL; char *tmpmask =3D NULL; char *next =3D NULL; @@ -8028,7 +7987,6 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, VIR_FREE(nodeBackends); } =20 - virBufferFreeAndReset(&buf); return ret; } =20 @@ -8044,7 +8002,7 @@ qemuBuildMemoryDeviceCommandLine(virCommandPtr cmd, /* memory hotplug requires NUMA to be enabled - we already checked * that memory devices are present only when NUMA is */ for (i =3D 0; i < def->nmems; i++) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *dimmStr; =20 if (qemuBuildMemoryDimmBackendStr(&buf, def->mems[i], def, cfg, pr= iv) < 0) @@ -8072,7 +8030,7 @@ qemuBuildGraphicsSDLCommandLine(virQEMUDriverConfigPt= r cfg ATTRIBUTE_UNUSED, virDomainGraphicsDefPtr graphics) { int ret =3D -1; - virBuffer opt =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; =20 if (graphics->data.sdl.xauth) virCommandAddEnvPair(cmd, "XAUTHORITY", graphics->data.sdl.xauth); @@ -8111,7 +8069,6 @@ qemuBuildGraphicsSDLCommandLine(virQEMUDriverConfigPt= r cfg ATTRIBUTE_UNUSED, =20 ret =3D 0; cleanup: - virBufferFreeAndReset(&opt); return ret; } =20 @@ -8122,7 +8079,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPt= r cfg, virQEMUCapsPtr qemuCaps, virDomainGraphicsDefPtr graphics) { - virBuffer opt =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; virDomainGraphicsListenDefPtr glisten =3D NULL; bool escapeAddr; =20 @@ -8248,7 +8205,6 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPt= r cfg, return 0; =20 error: - virBufferFreeAndReset(&opt); return -1; } =20 @@ -8259,7 +8215,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, virQEMUCapsPtr qemuCaps, virDomainGraphicsDefPtr graphics) { - virBuffer opt =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; virDomainGraphicsListenDefPtr glisten =3D NULL; int port =3D graphics->data.spice.port; int tlsPort =3D graphics->data.spice.tlsPort; @@ -8500,7 +8456,6 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, return 0; =20 error: - virBufferFreeAndReset(&opt); return -1; } =20 @@ -8512,7 +8467,7 @@ qemuBuildGraphicsEGLHeadlessCommandLine(virQEMUDriver= ConfigPtr cfg ATTRIBUTE_UNU virDomainGraphicsDefPtr graphics) { int ret =3D -1; - virBuffer opt =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; =20 virBufferAddLit(&opt, "egl-headless"); =20 @@ -8537,7 +8492,6 @@ qemuBuildGraphicsEGLHeadlessCommandLine(virQEMUDriver= ConfigPtr cfg ATTRIBUTE_UNU =20 ret =3D 0; cleanup: - virBufferFreeAndReset(&opt); return ret; } =20 @@ -9086,7 +9040,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logMan= ager, size_t i; virDomainSmartcardDefPtr smartcard; char *devstr; - virBuffer opt =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; const char *database; const char *contAlias =3D NULL; unsigned int cdevflags =3D QEMU_BUILD_CHARDEV_TCP_NOWAIT | @@ -9108,7 +9062,6 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logMan= ager, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("this QEMU binary lacks multiple smartcard " "support")); - virBufferFreeAndReset(&opt); return -1; } =20 @@ -9199,7 +9152,7 @@ qemuBuildShmemDevLegacyStr(virDomainDefPtr def, virDomainShmemDefPtr shmem, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -9237,7 +9190,6 @@ qemuBuildShmemDevLegacyStr(virDomainDefPtr def, return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -9246,7 +9198,7 @@ qemuBuildShmemDevStr(virDomainDefPtr def, virDomainShmemDefPtr shmem, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if ((shmem->model =3D=3D VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_PLAIN && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_PLAIN)) || @@ -9274,10 +9226,8 @@ qemuBuildShmemDevStr(virDomainDefPtr def, virTristateSwitchTypeToString(shmem->msi.ioevent= fd)); } =20 - if (qemuBuildDeviceAddressStr(&buf, def, &shmem->info, qemuCaps) < 0) { - virBufferFreeAndReset(&buf); + if (qemuBuildDeviceAddressStr(&buf, def, &shmem->info, qemuCaps) < 0) return NULL; - } =20 if (virBufferCheckError(&buf) < 0) return NULL; @@ -9323,7 +9273,7 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager, bool chardevStdioLogd) { virJSONValuePtr memProps =3D NULL; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *devstr =3D NULL; int rc; unsigned int cdevflags =3D QEMU_BUILD_CHARDEV_TCP_NOWAIT | @@ -9755,7 +9705,7 @@ qemuBuildRedirdevDevStr(const virDomainDef *def, virQEMUCapsPtr qemuCaps) { size_t i; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virDomainRedirFilterDefPtr redirfilter =3D def->redirfilter; =20 if (dev->bus !=3D VIR_DOMAIN_REDIRDEV_BUS_USB) { @@ -9825,7 +9775,6 @@ qemuBuildRedirdevDevStr(const virDomainDef *def, return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -9877,7 +9826,7 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, virDomainDefPtr def) { virDomainLoaderDefPtr loader =3D def->os.loader; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; int unit =3D 0; =20 if (!loader) @@ -9927,8 +9876,6 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, /* nada */ break; } - - virBufferFreeAndReset(&buf); } =20 =20 @@ -9936,7 +9883,7 @@ static char * qemuBuildTPMDevStr(const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const virDomainTPMDef *tpm =3D def->tpm; const char *model =3D virDomainTPMModelTypeToString(tpm->model); virQEMUCapsFlags flag; @@ -9971,7 +9918,6 @@ qemuBuildTPMDevStr(const virDomainDef *def, return virBufferContentAndReset(&buf); =20 error: - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -10009,7 +9955,7 @@ qemuBuildTPMBackendStr(const virDomainDef *def, char **chardev) { const virDomainTPMDef *tpm =3D def->tpm; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *cancel_path =3D NULL; char *devset =3D NULL; char *cancelset =3D NULL; @@ -10068,8 +10014,6 @@ qemuBuildTPMBackendStr(const virDomainDef *def, error: VIR_FREE(devset); VIR_FREE(cancel_path); - - virBufferFreeAndReset(&buf); return NULL; } =20 @@ -10132,7 +10076,7 @@ static int qemuBuildSEVCommandLine(virDomainObjPtr vm, virCommandPtr cmd, virDomainSEVDefPtr sev) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; qemuDomainObjPrivatePtr priv =3D vm->privateData; char *path =3D NULL; int ret =3D -1; @@ -10165,7 +10109,6 @@ qemuBuildSEVCommandLine(virDomainObjPtr vm, virComm= andPtr cmd, virCommandAddArgBuffer(cmd, &buf); ret =3D 0; cleanup: - virBufferFreeAndReset(&buf); return ret; } =20 @@ -10350,7 +10293,7 @@ qemuBuildManagedPRCommandLine(virCommandPtr cmd, const virDomainDef *def, qemuDomainObjPrivatePtr priv) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virJSONValuePtr props =3D NULL; int ret =3D -1; =20 @@ -10368,7 +10311,6 @@ qemuBuildManagedPRCommandLine(virCommandPtr cmd, =20 ret =3D 0; cleanup: - virBufferFreeAndReset(&buf); virJSONValueFree(props); return ret; } @@ -10499,7 +10441,7 @@ qemuBuildVsockDevStr(virDomainDefPtr def, const char *fdprefix) { qemuDomainVsockPrivatePtr priv =3D (qemuDomainVsockPrivatePtr)vsock->p= rivateData; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *ret =3D NULL; =20 =20 @@ -10520,7 +10462,6 @@ qemuBuildVsockDevStr(virDomainDefPtr def, ret =3D virBufferContentAndReset(&buf); =20 cleanup: - virBufferFreeAndReset(&buf); return ret; } =20 @@ -10847,7 +10788,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, virDomainChrDefPtr serial, virQEMUCapsPtr qemuCaps) { - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virQEMUCapsFlags caps; =20 switch ((virDomainChrSerialTargetModel) serial->targetModel) { @@ -10895,7 +10836,6 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, return 0; =20 error: - virBufferFreeAndReset(&buf); return -1; } =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305981; cv=none; d=zoho.com; s=zohoarc; b=HZUHzckmzOQAhmHYJPOl+0wnFYAIEH4uBvd4OTwLlTNWbtXNwMCuIMj2AXCEXA7Yl26SWz/bdcTU/ypvSAAnOUgNM+I9Wm1ysz3WR6ozSiRA0c7Xs8VJNBg3wV1Z89V5SVPhoIdQr4F7/h7FNtxBbmyr53BendCvv7LeXnKGThQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305981; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ZH+puVGj/kqUtXJV1nzw/ERQMXUFAe2S0Yk38SAiMWs=; b=PNuFsHrDd3PoNEru/4OT1qcb0w4vNmHTNIIK6CtxuCScCowiacOx8IgeE0C/IpPDz4wzH1dT+4iZQu1c+cyke7okOQla+wJHdnk74K7WBFqtYs2Ce+s7a+8xRku1+1yYzJePYQtUQYPNGxlQCmQe4ZQM1IcFDHHG6wLJJs7kyYA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566305981225474.01292873074124; Tue, 20 Aug 2019 05:59:41 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D5D3E8D5BAE; Tue, 20 Aug 2019 12:59:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A8C0D4274; Tue, 20 Aug 2019 12:59:39 +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 64E8B180BA9F; Tue, 20 Aug 2019 12:59:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxVcm023191 for ; Tue, 20 Aug 2019 08:59:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8F1AE18EEF; Tue, 20 Aug 2019 12:59:31 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 180EB13836 for ; Tue, 20 Aug 2019 12:59:29 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:07 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 08/19] qemu_command: use VIR_AUTOPTR for virJSONValue X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Tue, 20 Aug 2019 12:59:40 +0000 (UTC) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 94a6ad546e..b5448a074f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -738,7 +738,7 @@ qemuBuildObjectSecretCommandLine(virCommandPtr cmd, { VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; - virJSONValuePtr props =3D NULL; + VIR_AUTOPTR(virJSONValue) props =3D NULL; =20 if (qemuBuildSecretInfoProps(secinfo, &props) < 0) return -1; @@ -752,7 +752,6 @@ qemuBuildObjectSecretCommandLine(virCommandPtr cmd, ret =3D 0; =20 cleanup: - virJSONValueFree(props); return ret; } =20 @@ -935,7 +934,7 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd, { VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; - virJSONValuePtr props =3D NULL; + VIR_AUTOPTR(virJSONValue) props =3D NULL; =20 if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer, alias, certEncSecretAlias, qemuCaps, &props)= < 0) @@ -950,7 +949,6 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd, ret =3D 0; =20 cleanup: - virJSONValueFree(props); return ret; } =20 @@ -1641,7 +1639,7 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, qemuDomainStorageSourcePrivatePtr srcpriv =3D QEMU_DOMAIN_STORAGE_SOUR= CE_PRIVATE(disk->src); qemuDomainSecretInfoPtr secinfo =3D NULL; qemuDomainSecretInfoPtr encinfo =3D NULL; - virJSONValuePtr srcprops =3D NULL; + VIR_AUTOPTR(virJSONValue) srcprops =3D NULL; char *source =3D NULL; bool rawluks =3D false; int ret =3D -1; @@ -1729,7 +1727,6 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, =20 cleanup: VIR_FREE(source); - virJSONValueFree(srcprops); return ret; } =20 @@ -3407,7 +3404,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendP= rops, bool prealloc =3D false; virBitmapPtr nodemask =3D NULL; int ret =3D -1; - virJSONValuePtr props =3D NULL; + VIR_AUTOPTR(virJSONValue) props =3D NULL; bool nodeSpecified =3D virDomainNumatuneNodeSpecified(def->numa, mem->= targetNode); unsigned long long pagesize =3D mem->pagesize; bool needHugepage =3D !!pagesize; @@ -3651,7 +3648,6 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendP= rops, ret =3D -1; =20 cleanup: - virJSONValueFree(props); VIR_FREE(memPath); return ret; } @@ -3664,7 +3660,7 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, qemuDomainObjPrivatePtr priv, virBufferPtr buf) { - virJSONValuePtr props =3D NULL; + VIR_AUTOPTR(virJSONValue) props =3D NULL; char *alias =3D NULL; int ret =3D -1; int rc; @@ -3690,7 +3686,6 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, =20 cleanup: VIR_FREE(alias); - virJSONValueFree(props); =20 return ret; } @@ -3703,7 +3698,7 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf, virQEMUDriverConfigPtr cfg, qemuDomainObjPrivatePtr priv) { - virJSONValuePtr props =3D NULL; + VIR_AUTOPTR(virJSONValue) props =3D NULL; char *alias =3D NULL; int ret =3D -1; =20 @@ -3727,7 +3722,6 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf, =20 cleanup: VIR_FREE(alias); - virJSONValueFree(props); =20 return ret; } @@ -5050,7 +5044,7 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPt= r dev, char *ret =3D NULL; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *netsource =3D NULL; - virJSONValuePtr srcprops =3D NULL; + VIR_AUTOPTR(virJSONValue) srcprops =3D NULL; virDomainHostdevSubsysSCSIPtr scsisrc =3D &dev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc =3D &scsisrc->u.iscsi; qemuDomainStorageSourcePrivatePtr srcPriv =3D @@ -5079,7 +5073,6 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPt= r dev, =20 cleanup: VIR_FREE(netsource); - virJSONValueFree(srcprops); return ret; } =20 @@ -6080,7 +6073,7 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager, size_t i; =20 for (i =3D 0; i < def->nrngs; i++) { - virJSONValuePtr props; + VIR_AUTOPTR(virJSONValue) props =3D NULL; virBuffer buf =3D VIR_BUFFER_INITIALIZER; virDomainRNGDefPtr rng =3D def->rngs[i]; char *tmp; @@ -6107,7 +6100,6 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager, return -1; =20 rc =3D virQEMUBuildObjectCommandlineFromJSON(&buf, props); - virJSONValueFree(props); =20 if (rc < 0) return -1; @@ -9272,7 +9264,7 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager, virQEMUCapsPtr qemuCaps, bool chardevStdioLogd) { - virJSONValuePtr memProps =3D NULL; + VIR_AUTOPTR(virJSONValue) memProps =3D NULL; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *devstr =3D NULL; int rc; @@ -9317,7 +9309,6 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager, return -1; =20 rc =3D virQEMUBuildObjectCommandlineFromJSON(&buf, memProps); - virJSONValueFree(memProps); =20 if (rc < 0) return -1; @@ -10294,7 +10285,7 @@ qemuBuildManagedPRCommandLine(virCommandPtr cmd, qemuDomainObjPrivatePtr priv) { VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - virJSONValuePtr props =3D NULL; + VIR_AUTOPTR(virJSONValue) props =3D NULL; int ret =3D -1; =20 if (!virDomainDefHasManagedPR(def)) @@ -10311,7 +10302,6 @@ qemuBuildManagedPRCommandLine(virCommandPtr cmd, =20 ret =3D 0; cleanup: - virJSONValueFree(props); return ret; } =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305985; cv=none; d=zoho.com; s=zohoarc; b=kH+lpLdw/w066NpLdIR8ZjfVuH8FBwfIQHJp3wFTQiDr6TE8wfXyeCbnVuUThYryMaYzGfr89QyJ4eM7Ye2TLcvQrkWDliglrkZSxnbYOo9FKAtvGJLiLvMlyebKNZiWHze880khGemJiC/tzg3mr17nAkwfxY/G6fO08DwtVk8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305985; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=f/2VXPGmKpVwACQkXStBPwK0oRKVDAzga4m4j5tap08=; b=BsLoZWBl+RJEoiaV6+edPF1Xpll1zDtih7owEWvir2gs2kufQQFTBJc7W2eo07NdUJuUaGqXCBlBGPsVfYwje9qysDAvBOXaVvna6HV2upDRMQTnChHbm0ld0Y7KAPlGEzoTZrQiNzlhcolXssaNiddKHrjC/RrQFyVxjt3q6Ms= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566305985923700.5657557504979; Tue, 20 Aug 2019 05:59:45 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 3B56430A76BE; Tue, 20 Aug 2019 12:59:43 +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 15F9760C18; Tue, 20 Aug 2019 12:59:43 +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 CBE374E58A; Tue, 20 Aug 2019 12:59:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxYdw023203 for ; Tue, 20 Aug 2019 08:59:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0364080696; Tue, 20 Aug 2019 12:59:34 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D01218EF5 for ; Tue, 20 Aug 2019 12:59:31 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:08 +0200 Message-Id: <9baa9b9c88eebc5d93c4056e9c46850f840f79f0.1566305923.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 09/19] qemu_command: use VIR_AUTOFREE for variables used once X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 20 Aug 2019 12:59:43 +0000 (UTC) Remove the VIR_FREE's from the cleanup sections. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 207 +++++++++++++--------------------------- 1 file changed, 66 insertions(+), 141 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b5448a074f..fe06867a88 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -203,8 +203,8 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd, qemuDomainObjPrivatePtr priv) { int ret =3D -1; - char *alias =3D NULL; - char *path =3D NULL; + VIR_AUTOFREE(char *) alias =3D NULL; + VIR_AUTOFREE(char *) path =3D NULL; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 /* If the -object secret does not exist, then just return. This just @@ -235,8 +235,6 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd, ret =3D 0; =20 cleanup: - VIR_FREE(alias); - VIR_FREE(path); return ret; } =20 @@ -301,7 +299,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, virQEMUCapsPtr qemuCaps) { int ret =3D -1; - char *devStr =3D NULL; + VIR_AUTOFREE(char *) devStr =3D NULL; const char *contAlias =3D NULL; bool contIsPHB =3D false; int contTargetIndex =3D 0; @@ -401,7 +399,6 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, =20 ret =3D 0; cleanup: - VIR_FREE(devStr); return ret; } =20 @@ -703,7 +700,7 @@ qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinf= o, virJSONValuePtr *propsret) { int ret =3D -1; - char *keyid =3D NULL; + VIR_AUTOFREE(char *) keyid =3D NULL; =20 if (!(keyid =3D qemuDomainGetMasterKeyAlias())) return -1; @@ -715,7 +712,6 @@ qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinf= o, "s:iv", secinfo->s.aes.iv, "s:format", "base64", NULL); =20 - VIR_FREE(keyid); return ret; } =20 @@ -1518,13 +1514,12 @@ qemuCheckFips(void) bool ret =3D false; =20 if (virFileExists("/proc/sys/crypto/fips_enabled")) { - char *buf =3D NULL; + VIR_AUTOFREE(char *) buf =3D NULL; =20 if (virFileReadAll("/proc/sys/crypto/fips_enabled", 10, &buf) < 0) return ret; if (STREQ(buf, "1\n")) ret =3D true; - VIR_FREE(buf); } =20 return ret; @@ -1612,7 +1607,7 @@ static int qemuBuildDriveSourcePR(virBufferPtr buf, virDomainDiskDefPtr disk) { - char *alias =3D NULL; + VIR_AUTOFREE(char *) alias =3D NULL; const char *defaultAlias =3D NULL; =20 if (!disk->src->pr) @@ -1625,7 +1620,6 @@ qemuBuildDriveSourcePR(virBufferPtr buf, =20 =20 virBufferAsprintf(buf, ",file.pr-manager=3D%s", alias ? alias : defaul= tAlias); - VIR_FREE(alias); return 0; } =20 @@ -1640,7 +1634,7 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, qemuDomainSecretInfoPtr secinfo =3D NULL; qemuDomainSecretInfoPtr encinfo =3D NULL; VIR_AUTOPTR(virJSONValue) srcprops =3D NULL; - char *source =3D NULL; + VIR_AUTOFREE(char *) source =3D NULL; bool rawluks =3D false; int ret =3D -1; =20 @@ -1726,7 +1720,6 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, ret =3D 0; =20 cleanup: - VIR_FREE(source); return ret; } =20 @@ -1839,13 +1832,12 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, goto error; =20 if (!qemuDiskBusNeedsDriveArg(disk->bus)) { - char *drivealias =3D qemuAliasDiskDriveFromDisk(disk); + VIR_AUTOFREE(char *) drivealias =3D qemuAliasDiskDriveFromDisk(dis= k); if (!drivealias) goto error; =20 virBufferAddLit(&opt, "if=3Dnone"); virBufferAsprintf(&opt, ",id=3D%s", drivealias); - VIR_FREE(drivealias); } else { int idx =3D virDiskNameToIndex(disk->dst); =20 @@ -2000,7 +1992,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; const char *bus =3D virDomainDiskQEMUBusTypeToString(disk->bus); const char *contAlias; - char *backendAlias =3D NULL; + VIR_AUTOFREE(char *) backendAlias =3D NULL; VIR_AUTOFREE(char *) scsiVPDDeviceId =3D NULL; int controllerModel; =20 @@ -2334,7 +2326,6 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, return virBufferContentAndReset(&opt); =20 error: - VIR_FREE(backendAlias); return NULL; } =20 @@ -2360,7 +2351,7 @@ static int qemuCommandAddZPCIDevice(virCommandPtr cmd, virDomainDeviceInfoPtr dev) { - char *devstr =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; =20 virCommandAddArg(cmd, "-device"); =20 @@ -2369,7 +2360,6 @@ qemuCommandAddZPCIDevice(virCommandPtr cmd, =20 virCommandAddArg(cmd, devstr); =20 - VIR_FREE(devstr); return 0; } =20 @@ -2399,9 +2389,9 @@ qemuBuildFloppyCommandLineControllerOptions(virComman= dPtr cmd, bool hasfloppy =3D false; unsigned int bootindex; char driveLetter; - char *backendAlias =3D NULL; - char *backendStr =3D NULL; - char *bootindexStr =3D NULL; + VIR_AUTOFREE(char *) backendAlias =3D NULL; + VIR_AUTOFREE(char *) backendStr =3D NULL; + VIR_AUTOFREE(char *) bootindexStr =3D NULL; size_t i; int ret =3D -1; =20 @@ -2471,9 +2461,6 @@ qemuBuildFloppyCommandLineControllerOptions(virComman= dPtr cmd, ret =3D 0; =20 cleanup: - VIR_FREE(backendAlias); - VIR_FREE(backendStr); - VIR_FREE(bootindexStr); return ret; } =20 @@ -2582,7 +2569,7 @@ qemuBuildDiskCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps, unsigned int bootindex) { - char *optstr; + VIR_AUTOFREE(char *) optstr =3D NULL; =20 if (qemuBuildDiskSourceCommandLine(cmd, disk, qemuCaps) < 0) return -1; @@ -2599,7 +2586,6 @@ qemuBuildDiskCommandLine(virCommandPtr cmd, qemuCaps))) return -1; virCommandAddArg(cmd, optstr); - VIR_FREE(optstr); } } =20 @@ -3400,7 +3386,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendP= rops, const long system_page_size =3D virGetSystemPageSizeKB(); virDomainMemoryAccess memAccess =3D mem->access; size_t i; - char *memPath =3D NULL; + VIR_AUTOFREE(char *) memPath =3D NULL; bool prealloc =3D false; virBitmapPtr nodemask =3D NULL; int ret =3D -1; @@ -3648,7 +3634,6 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendP= rops, ret =3D -1; =20 cleanup: - VIR_FREE(memPath); return ret; } =20 @@ -3661,7 +3646,7 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, virBufferPtr buf) { VIR_AUTOPTR(virJSONValue) props =3D NULL; - char *alias =3D NULL; + VIR_AUTOFREE(char *) alias =3D NULL; int ret =3D -1; int rc; virDomainMemoryDef mem =3D { 0 }; @@ -3685,7 +3670,6 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, ret =3D rc; =20 cleanup: - VIR_FREE(alias); =20 return ret; } @@ -3699,7 +3683,7 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf, qemuDomainObjPrivatePtr priv) { VIR_AUTOPTR(virJSONValue) props =3D NULL; - char *alias =3D NULL; + VIR_AUTOFREE(char *) alias =3D NULL; int ret =3D -1; =20 if (!mem->info.alias) { @@ -3721,7 +3705,6 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf, ret =3D 0; =20 cleanup: - VIR_FREE(alias); =20 return ret; } @@ -3995,7 +3978,6 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, virDomainNetType netType =3D virDomainNetGetActualType(net); virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); size_t i; - char *addr =3D NULL; char *ret =3D NULL; =20 if (net->script && netType !=3D VIR_DOMAIN_NET_TYPE_ETHERNET) { @@ -4062,6 +4044,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, virBufferAddLit(&buf, "user,"); for (i =3D 0; i < net->guestIP.nips; i++) { const virNetDevIPAddr *ip =3D net->guestIP.ips[i]; + VIR_AUTOFREE(char *) addr =3D NULL; const char *prefix =3D ""; =20 if (!(addr =3D virSocketAddrFormat(&ip->address))) @@ -4076,7 +4059,6 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, if (ip->prefix) virBufferAsprintf(&buf, "/%u", ip->prefix); virBufferAddChar(&buf, ','); - VIR_FREE(addr); } break; =20 @@ -4127,7 +4109,6 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, ret =3D virBufferContentAndReset(&buf); cleanup: virObjectUnref(cfg); - VIR_FREE(addr); return ret; } =20 @@ -4166,7 +4147,7 @@ qemuBuildWatchdogCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { virDomainWatchdogDefPtr watchdog =3D def->watchdog; - char *optstr; + VIR_AUTOFREE(char *) optstr =3D NULL; const char *action; int actualAction; =20 @@ -4183,7 +4164,6 @@ qemuBuildWatchdogCommandLine(virCommandPtr cmd, return -1; =20 virCommandAddArg(cmd, optstr); - VIR_FREE(optstr); =20 /* qemu doesn't have a 'dump' action; we tell qemu to 'pause', then libvirt listens for the watchdog event, and we perform the dump @@ -4285,13 +4265,12 @@ qemuBuildNVRAMCommandLine(virCommandPtr cmd, return -1; } =20 - char *optstr; + VIR_AUTOFREE(char *) optstr =3D NULL; virCommandAddArg(cmd, "-global"); optstr =3D qemuBuildNVRAMDevStr(def->nvram); if (!optstr) return -1; virCommandAddArg(cmd, optstr); - VIR_FREE(optstr); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("nvram device is only supported for PPC64")); @@ -4430,7 +4409,7 @@ qemuBuildInputCommandLine(virCommandPtr cmd, =20 for (i =3D 0; i < def->ninputs; i++) { virDomainInputDefPtr input =3D def->inputs[i]; - char *devstr =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; =20 if (qemuCommandAddExtDevice(cmd, &input->info) < 0) return -1; @@ -4442,8 +4421,6 @@ qemuBuildInputCommandLine(virCommandPtr cmd, virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, devstr); } - - VIR_FREE(devstr); } =20 return 0; @@ -4566,7 +4543,7 @@ qemuBuildSoundCommandLine(virCommandPtr cmd, =20 for (i =3D 0; i < def->nsounds; i++) { virDomainSoundDefPtr sound =3D def->sounds[i]; - char *str =3D NULL; + VIR_AUTOFREE(char *) str =3D NULL; =20 /* Sadly pcspk device doesn't use -device syntax. Fortunately * we don't need to set any PCI address on it, so we don't @@ -4582,7 +4559,6 @@ qemuBuildSoundCommandLine(virCommandPtr cmd, return -1; =20 virCommandAddArg(cmd, str); - VIR_FREE(str); if (sound->model =3D=3D VIR_DOMAIN_SOUND_MODEL_ICH6 || sound->model =3D=3D VIR_DOMAIN_SOUND_MODEL_ICH9) { char *codecstr =3D NULL; @@ -4808,7 +4784,7 @@ qemuBuildVideoCommandLine(virCommandPtr cmd, size_t i; =20 for (i =3D 0; i < def->nvideos; i++) { - char *str =3D NULL; + VIR_AUTOFREE(char *) str =3D NULL; virDomainVideoDefPtr video =3D def->videos[i]; =20 if (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_NONE) @@ -4827,7 +4803,6 @@ qemuBuildVideoCommandLine(virCommandPtr cmd, return -1; =20 virCommandAddArg(cmd, str); - VIR_FREE(str); } else { if (qemuBuildVgaVideoCommand(cmd, video, qemuCaps) < 0) return -1; @@ -4842,7 +4817,6 @@ qemuBuildVideoCommandLine(virCommandPtr cmd, return -1; =20 virCommandAddArg(cmd, str); - VIR_FREE(str); } } =20 @@ -4854,7 +4828,7 @@ int qemuOpenPCIConfig(virDomainHostdevDefPtr dev) { virDomainHostdevSubsysPCIPtr pcisrc =3D &dev->source.subsys.u.pci; - char *path =3D NULL; + VIR_AUTOFREE(char *) path =3D NULL; int configfd =3D -1; =20 if (virAsprintf(&path, "/sys/bus/pci/devices/%04x:%02x:%02x.%01x/confi= g", @@ -4867,8 +4841,6 @@ qemuOpenPCIConfig(virDomainHostdevDefPtr dev) if (configfd < 0) virReportSystemError(errno, _("Failed opening %s"), path); =20 - VIR_FREE(path); - return configfd; } =20 @@ -5011,13 +4983,12 @@ qemuBuildHubCommandLine(virCommandPtr cmd, =20 for (i =3D 0; i < def->nhubs; i++) { virDomainHubDefPtr hub =3D def->hubs[i]; - char *optstr; + VIR_AUTOFREE(char *) optstr =3D NULL; =20 virCommandAddArg(cmd, "-device"); if (!(optstr =3D qemuBuildHubDevStr(def, hub, qemuCaps))) return -1; virCommandAddArg(cmd, optstr); - VIR_FREE(optstr); } =20 return 0; @@ -5043,7 +5014,7 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPt= r dev, { char *ret =3D NULL; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - char *netsource =3D NULL; + VIR_AUTOFREE(char *) netsource =3D NULL; VIR_AUTOPTR(virJSONValue) srcprops =3D NULL; virDomainHostdevSubsysSCSIPtr scsisrc =3D &dev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc =3D &scsisrc->u.iscsi; @@ -5072,7 +5043,6 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPt= r dev, ret =3D virBufferContentAndReset(&buf); =20 cleanup: - VIR_FREE(netsource); return ret; } =20 @@ -5118,8 +5088,8 @@ qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps) { VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - char *source =3D NULL; - char *drivealias =3D NULL; + VIR_AUTOFREE(char *) source =3D NULL; + VIR_AUTOFREE(char *) drivealias =3D NULL; virDomainHostdevSubsysSCSIPtr scsisrc =3D &dev->source.subsys.u.scsi; =20 if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISC= SI) { @@ -5131,12 +5101,10 @@ qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr d= ev, goto error; virBufferAsprintf(&buf, "file=3D/dev/%s,if=3Dnone,format=3Draw", s= ource); } - VIR_FREE(source); =20 if (!(drivealias =3D qemuAliasFromHostdev(dev))) goto error; virBufferAsprintf(&buf, ",id=3D%s", drivealias); - VIR_FREE(drivealias); =20 if (dev->readonly) virBufferAddLit(&buf, ",readonly=3Don"); @@ -5155,7 +5123,7 @@ qemuBuildSCSIHostdevDevStr(const virDomainDef *def, { VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; int model =3D -1; - char *driveAlias; + VIR_AUTOFREE(char *) driveAlias =3D NULL; const char *contAlias; =20 model =3D qemuDomainFindSCSIControllerModel(def, dev->info); @@ -5200,7 +5168,6 @@ qemuBuildSCSIHostdevDevStr(const virDomainDef *def, if (!(driveAlias =3D qemuAliasFromHostdev(dev))) goto error; virBufferAsprintf(&buf, ",drive=3D%s,id=3D%s", driveAlias, dev->info->= alias); - VIR_FREE(driveAlias); =20 if (dev->info->bootIndex) virBufferAsprintf(&buf, ",bootindex=3D%u", dev->info->bootIndex); @@ -5222,7 +5189,8 @@ qemuBuildChrChardevFileStr(virLogManagerPtr logManage= r, const char *appendarg, int appendval) { if (logManager) { - char *fdset, *fdpath; + VIR_AUTOFREE(char *) fdset =3D NULL; + VIR_AUTOFREE(char *) fdpath =3D NULL; int flags =3D 0; int logfd; =20 @@ -5245,13 +5213,11 @@ qemuBuildChrChardevFileStr(virLogManagerPtr logMana= ger, =20 virCommandAddArg(cmd, "-add-fd"); virCommandAddArg(cmd, fdset); - VIR_FREE(fdset); =20 if (!(fdpath =3D qemuVirCommandGetDevSet(cmd, logfd))) return -1; =20 virBufferAsprintf(buf, ",%s=3D%s,%s=3Don", filearg, fdpath, append= arg); - VIR_FREE(fdpath); } else { virBufferAsprintf(buf, ",%s=3D", filearg); virQEMUBuildBufferEscapeComma(buf, fileval); @@ -5356,7 +5322,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, qemuDomainChrSourcePrivatePtr chrSourcePriv =3D QEMU_DOMAIN_CHR_SOURCE= _PRIVATE(dev); VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; bool telnet; - char *charAlias =3D NULL; + VIR_AUTOFREE(char *) charAlias =3D NULL; char *ret =3D NULL; =20 if (!(charAlias =3D qemuAliasChardevFromDevAlias(alias))) @@ -5447,7 +5413,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, qemuBuildChrChardevReconnectStr(&buf, &dev->data.tcp.reconnect); =20 if (dev->data.tcp.haveTLS =3D=3D VIR_TRISTATE_BOOL_YES) { - char *objalias =3D NULL; + VIR_AUTOFREE(char *) objalias =3D NULL; const char *tlsCertEncSecAlias =3D NULL; =20 /* Add the secret object first if necessary. The @@ -5470,12 +5436,10 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, cfg->chardevTLSx509verify, tlsCertEncSecAlias, objalias, qemuCaps) < 0) { - VIR_FREE(objalias); goto cleanup; } =20 virBufferAsprintf(&buf, ",tls-creds=3D%s", objalias); - VIR_FREE(objalias); } break; =20 @@ -5544,7 +5508,6 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, =20 ret =3D virBufferContentAndReset(&buf); cleanup: - VIR_FREE(charAlias); return ret; } =20 @@ -5556,7 +5519,7 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *de= f, VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysMediatedDevPtr mdevsrc =3D &dev->source.subsys.u= .mdev; char *ret =3D NULL; - char *mdevPath =3D NULL; + VIR_AUTOFREE(char *) mdevPath =3D NULL; const char *dev_str =3D NULL; =20 if (!(mdevPath =3D virMediatedDeviceGetSysfsPath(mdevsrc->uuidstr))) @@ -5583,7 +5546,6 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *de= f, ret =3D virBufferContentAndReset(&buf); =20 cleanup: - VIR_FREE(mdevPath); return ret; } =20 @@ -5598,7 +5560,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, for (i =3D 0; i < def->nhostdevs; i++) { virDomainHostdevDefPtr hostdev =3D def->hostdevs[i]; virDomainHostdevSubsysPtr subsys =3D &hostdev->source.subsys; - char *devstr; + VIR_AUTOFREE(char *) devstr =3D NULL; =20 if (hostdev->info->bootIndex) { if (hostdev->mode !=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || @@ -5621,7 +5583,6 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, qemuBuildUSBHostdevDevStr(def, hostdev, qemuCaps))) return -1; virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); } =20 /* PCI */ @@ -5638,7 +5599,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, } } =20 - char *configfd_name =3D NULL; + VIR_AUTOFREE(char *) configfd_name =3D NULL; unsigned int bootIndex =3D hostdev->info->bootIndex; =20 /* bootNet will be non-0 if boot order was set and no other @@ -5668,18 +5629,16 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, virCommandAddArg(cmd, "-device"); devstr =3D qemuBuildPCIHostdevDevStr(def, hostdev, bootIndex, configfd_name, qemuCaps); - VIR_FREE(configfd_name); if (!devstr) return -1; virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); } =20 /* SCSI */ if (virHostdevIsSCSIDevice(hostdev)) { virDomainHostdevSubsysSCSIPtr scsisrc =3D &hostdev->source.subsys.u.scsi; - char *drvstr; + VIR_AUTOFREE(char *) drvstr =3D NULL; =20 if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_= TYPE_ISCSI) { virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc =3D @@ -5697,13 +5656,11 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, if (!(drvstr =3D qemuBuildSCSIHostdevDrvStr(hostdev, qemuCaps)= )) return -1; virCommandAddArg(cmd, drvstr); - VIR_FREE(drvstr); =20 virCommandAddArg(cmd, "-device"); if (!(devstr =3D qemuBuildSCSIHostdevDevStr(def, hostdev))) return -1; virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); } =20 /* SCSI_host */ @@ -5711,7 +5668,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, subsys->type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST) { if (hostdev->source.subsys.u.scsi_host.protocol =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_VHOST) { - char *vhostfdName =3D NULL; + VIR_AUTOFREE(char *) vhostfdName =3D NULL; int vhostfd =3D -1; =20 if (virSCSIVHostOpenVhostSCSI(&vhostfd) < 0) @@ -5729,14 +5686,10 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, if (!(devstr =3D qemuBuildSCSIVHostHostdevDevStr(def, hostdev, qemuCaps, - vhostfdName= ))) { - VIR_FREE(vhostfdName); + vhostfdName= ))) return -1; - } - virCommandAddArg(cmd, devstr); =20 - VIR_FREE(vhostfdName); - VIR_FREE(devstr); + virCommandAddArg(cmd, devstr); } } =20 @@ -5782,7 +5735,6 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, qemuBuildHostdevMediatedDevStr(def, hostdev, qemuCaps))) return -1; virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); } } =20 @@ -5798,7 +5750,7 @@ qemuBuildMonitorCommandLine(virLogManagerPtr logManag= er, virDomainDefPtr def, qemuDomainObjPrivatePtr priv) { - char *chrdev; + VIR_AUTOFREE(char *) chrdev =3D NULL; unsigned int cdevflags =3D QEMU_BUILD_CHARDEV_TCP_NOWAIT | QEMU_BUILD_CHARDEV_UNIX_FD_PASS; if (priv->chardevStdioLogd) @@ -5814,7 +5766,6 @@ qemuBuildMonitorCommandLine(virLogManagerPtr logManag= er, return -1; virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, chrdev); - VIR_FREE(chrdev); =20 virCommandAddArg(cmd, "-mon"); virCommandAddArg(cmd, "chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontr= ol"); @@ -5963,8 +5914,8 @@ qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, virQEMUCapsPtr qemuCaps, virJSONValuePtr *props) { - char *objAlias =3D NULL; - char *charBackendAlias =3D NULL; + VIR_AUTOFREE(char *) objAlias =3D NULL; + VIR_AUTOFREE(char *) charBackendAlias =3D NULL; int ret =3D -1; =20 if (virAsprintf(&objAlias, "obj%s", rng->info.alias) < 0) @@ -6013,8 +5964,6 @@ qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, ret =3D 0; =20 cleanup: - VIR_FREE(objAlias); - VIR_FREE(charBackendAlias); return ret; } =20 @@ -6585,13 +6534,12 @@ qemuBuildClockCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { size_t i; - char *rtcopt; + VIR_AUTOFREE(char *) rtcopt =3D NULL; =20 virCommandAddArg(cmd, "-rtc"); if (!(rtcopt =3D qemuBuildClockArgStr(&def->clock))) return -1; virCommandAddArg(cmd, rtcopt); - VIR_FREE(rtcopt); =20 if (def->clock.offset =3D=3D VIR_DOMAIN_CLOCK_OFFSET_TIMEZONE && def->clock.data.timezone) { @@ -6747,7 +6695,7 @@ qemuBuildBootCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { VIR_AUTOCLEAN(virBuffer) boot_buf =3D VIR_BUFFER_INITIALIZER; - char *boot_opts_str =3D NULL; + VIR_AUTOFREE(char *) boot_opts_str =3D NULL; =20 if (def->os.bootmenu) { if (def->os.bootmenu =3D=3D VIR_TRISTATE_BOOL_YES) @@ -6814,7 +6762,6 @@ qemuBuildBootCommandLine(virCommandPtr cmd, return 0; =20 error: - VIR_FREE(boot_opts_str); return -1; } =20 @@ -7047,7 +6994,8 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { virArch hostarch =3D virArchFromHost(); - char *cpu =3D NULL, *cpu_flags =3D NULL; + VIR_AUTOFREE(char *) cpu =3D NULL; + VIR_AUTOFREE(char *) cpu_flags =3D NULL; int ret =3D -1; VIR_AUTOCLEAN(virBuffer) cpu_buf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; @@ -7259,8 +7207,6 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, ret =3D 0; =20 cleanup: - VIR_FREE(cpu); - VIR_FREE(cpu_flags); return ret; } =20 @@ -7665,7 +7611,7 @@ static int qemuBuildSmpCommandLine(virCommandPtr cmd, virDomainDefPtr def) { - char *smp; + char *smp =3D NULL; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; unsigned int maxvcpus =3D virDomainDefGetVcpusMax(def); unsigned int nvcpus =3D 0; @@ -7716,7 +7662,7 @@ qemuBuildMemPathStr(virQEMUDriverConfigPtr cfg, qemuDomainObjPrivatePtr priv) { const long system_page_size =3D virGetSystemPageSizeKB(); - char *mem_path =3D NULL; + VIR_AUTOFREE(char *) mem_path =3D NULL; =20 /* There are two cases where we want to put -mem-path onto * the command line: First one is when there are no guest @@ -7743,7 +7689,6 @@ qemuBuildMemPathStr(virQEMUDriverConfigPtr cfg, } =20 virCommandAddArgList(cmd, "-mem-path", mem_path, NULL); - VIR_FREE(mem_path); =20 return 0; } @@ -8602,9 +8547,9 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, int **nicindexes) { int ret =3D -1; - char *nic =3D NULL; - char *host =3D NULL; - char *chardev =3D NULL; + VIR_AUTOFREE(char *) nic =3D NULL; + VIR_AUTOFREE(char *) host =3D NULL; + VIR_AUTOFREE(char *) chardev =3D NULL; int *tapfd =3D NULL; size_t tapfdSize =3D 0; int *vhostfd =3D NULL; @@ -8918,9 +8863,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, VIR_FREE(tapfdName); VIR_FREE(vhostfd); VIR_FREE(tapfd); - VIR_FREE(chardev); - VIR_FREE(host); - VIR_FREE(nic); return ret; } =20 @@ -9031,7 +8973,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logMan= ager, { size_t i; virDomainSmartcardDefPtr smartcard; - char *devstr; + VIR_AUTOFREE(char *) devstr =3D NULL; VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; const char *database; const char *contAlias =3D NULL; @@ -9109,7 +9051,6 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logMan= ager, } virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); =20 virBufferAsprintf(&opt, "ccid-card-passthru,chardev=3Dchar%s", smartcard->info.alias); @@ -9231,8 +9172,8 @@ qemuBuildShmemDevStr(virDomainDefPtr def, virJSONValuePtr qemuBuildShmemBackendMemProps(virDomainShmemDefPtr shmem) { - char *mem_alias =3D NULL; - char *mem_path =3D NULL; + VIR_AUTOFREE(char *) mem_alias =3D NULL; + VIR_AUTOFREE(char *) mem_path =3D NULL; virJSONValuePtr ret =3D NULL; =20 if (virAsprintf(&mem_path, "/dev/shm/%s", shmem->name) < 0) @@ -9248,8 +9189,6 @@ qemuBuildShmemBackendMemProps(virDomainShmemDefPtr sh= mem) NULL); =20 cleanup: - VIR_FREE(mem_alias); - VIR_FREE(mem_path); return ret; } =20 @@ -9387,13 +9326,12 @@ qemuBuildChrDeviceCommandLine(virCommandPtr cmd, virDomainChrDefPtr chr, virQEMUCapsPtr qemuCaps) { - char *devstr =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; =20 if (qemuBuildChrDeviceStr(&devstr, def, chr, qemuCaps) < 0) return -1; =20 virCommandAddArgList(cmd, "-device", devstr, NULL); - VIR_FREE(devstr); return 0; } =20 @@ -9461,7 +9399,7 @@ qemuBuildSerialCommandLine(virLogManagerPtr logManage= r, =20 for (i =3D 0; i < def->nserials; i++) { virDomainChrDefPtr serial =3D def->serials[i]; - char *devstr; + VIR_AUTOFREE(char *) devstr =3D NULL; =20 if (serial->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_SPICEPORT && != havespice) continue; @@ -9474,7 +9412,6 @@ qemuBuildSerialCommandLine(virLogManagerPtr logManage= r, return -1; virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); =20 /* If the device is not a platform device, build the devstr */ if (!qemuChrIsPlatformDevice(def, serial)) { @@ -9518,7 +9455,7 @@ qemuBuildParallelsCommandLine(virLogManagerPtr logMan= ager, =20 for (i =3D 0; i < def->nparallels; i++) { virDomainChrDefPtr parallel =3D def->parallels[i]; - char *devstr; + VIR_AUTOFREE(char *) devstr =3D NULL; =20 if (!(devstr =3D qemuBuildChrChardevStr(logManager, secManager, cmd, cfg, def, @@ -9528,7 +9465,6 @@ qemuBuildParallelsCommandLine(virLogManagerPtr logMan= ager, return -1; virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); =20 if (qemuBuildChrDeviceCommandLine(cmd, def, parallel, qemuCaps) < 0) @@ -9947,9 +9883,9 @@ qemuBuildTPMBackendStr(const virDomainDef *def, { const virDomainTPMDef *tpm =3D def->tpm; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - char *cancel_path =3D NULL; - char *devset =3D NULL; - char *cancelset =3D NULL; + VIR_AUTOFREE(char *) cancel_path =3D NULL; + VIR_AUTOFREE(char *) devset =3D NULL; + VIR_AUTOFREE(char *) cancelset =3D NULL; const char *tpmdev; =20 *tpmfd =3D -1; @@ -9980,10 +9916,6 @@ qemuBuildTPMBackendStr(const virDomainDef *def, virBufferAddLit(&buf, ",cancel-path=3D"); virQEMUBuildBufferEscapeComma(&buf, cancelset); =20 - VIR_FREE(devset); - VIR_FREE(cancelset); - VIR_FREE(cancel_path); - break; case VIR_DOMAIN_TPM_TYPE_EMULATOR: virBufferAddLit(&buf, ",chardev=3Dchrtpm"); @@ -10003,8 +9935,6 @@ qemuBuildTPMBackendStr(const virDomainDef *def, return virBufferContentAndReset(&buf); =20 error: - VIR_FREE(devset); - VIR_FREE(cancel_path); return NULL; } =20 @@ -10015,7 +9945,7 @@ qemuBuildTPMCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { char *optstr; - char *chardev =3D NULL; + VIR_AUTOFREE(char *) chardev =3D NULL; int tpmfd =3D -1; int cancelfd =3D -1; char *fdset; @@ -10031,10 +9961,8 @@ qemuBuildTPMCommandLine(virCommandPtr cmd, virCommandAddArgList(cmd, "-tpmdev", optstr, NULL); VIR_FREE(optstr); =20 - if (chardev) { + if (chardev) virCommandAddArgList(cmd, "-chardev", chardev, NULL); - VIR_FREE(chardev); - } =20 if (tpmfd >=3D 0) { fdset =3D qemuVirCommandGetFDSet(cmd, tpmfd); @@ -10252,7 +10180,7 @@ qemuBuildPRManagerInfoPropsInternal(const char *ali= as, virJSONValuePtr qemuBuildPRManagedManagerInfoProps(qemuDomainObjPrivatePtr priv) { - char *path =3D NULL; + VIR_AUTOFREE(char *) path =3D NULL; virJSONValuePtr ret =3D NULL; =20 if (!(path =3D qemuDomainGetManagedPRSocketPath(priv))) @@ -10261,7 +10189,6 @@ qemuBuildPRManagedManagerInfoProps(qemuDomainObjPri= vatePtr priv) ret =3D qemuBuildPRManagerInfoPropsInternal(qemuDomainGetManagedPRAlia= s(), path); =20 - VIR_FREE(path); return ret; } =20 @@ -10463,7 +10390,7 @@ qemuBuildVsockCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { qemuDomainVsockPrivatePtr priv =3D (qemuDomainVsockPrivatePtr)vsock->p= rivateData; - char *devstr =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; int ret =3D -1; =20 if (!(devstr =3D qemuBuildVsockDevStr(def, vsock, qemuCaps, ""))) @@ -10479,7 +10406,6 @@ qemuBuildVsockCommandLine(virCommandPtr cmd, =20 ret =3D 0; cleanup: - VIR_FREE(devstr); return ret; } =20 @@ -10845,7 +10771,7 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, virDomainChrDefPtr chr) { int ret =3D -1; - char *addr =3D NULL; + VIR_AUTOFREE(char *) addr =3D NULL; int port; =20 switch ((virDomainChrChannelTargetType)chr->targetType) { @@ -10875,7 +10801,6 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, =20 ret =3D 0; cleanup: - VIR_FREE(addr); return ret; } =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305982; cv=none; d=zoho.com; s=zohoarc; b=PBH9P+LCHCfk1Wdrnmz3to0Z7ziULDiHoMXDfGd27QLvsTps3O8rpKOR9WUx8hmHjgbrGAgWTWpFKH64HGo/lPrI1Zl9PM9fJ1X/NAWjyV29qaKK5NHIVJjXQN7Z6CVqQS65j/VsI936Su9q75mlLiG+JtiaBKkS/N6KKfq5xbQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305982; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=dO6Ubq2F40HqDmkUmHKU9oKcTHYytgWT4m27bA8/ovA=; b=BU/YtXi3tvjKgPKY9JguH0I0mO3PwS23aCyMkh9l4xwLLYhPmabVJh2wjXB/bU8Uy+m54jFY8c0WG9mRD7C2pFNt5/Q5JEUIskLN0tUV4y5eJmm87An5AKVdoFBC0RaHesz8xE1i1pNNB5rvtercd3TB8ymYQRiLycn9U/gdrGI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566305982466681.3288382822639; Tue, 20 Aug 2019 05:59:42 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 8AD5F30001D8; Tue, 20 Aug 2019 12:59:39 +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 643FC60C4E; Tue, 20 Aug 2019 12:59:39 +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 CA07624F34; Tue, 20 Aug 2019 12:59:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxaDt023213 for ; Tue, 20 Aug 2019 08:59:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 79B3913836; Tue, 20 Aug 2019 12:59:36 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 02BB318EEF for ; Tue, 20 Aug 2019 12:59:34 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:09 +0200 Message-Id: <2f364f094371f85e9b12ed44941150191f4da857.1566305923.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 10/19] qemuBuildNetworkDriveURI: use VIR_AUTOPTR for virURI X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 20 Aug 2019 12:59:40 +0000 (UTC) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fe06867a88..db8584243c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -953,7 +953,7 @@ static char * qemuBuildNetworkDriveURI(virStorageSourcePtr src, qemuDomainSecretInfoPtr secinfo) { - virURIPtr uri =3D NULL; + VIR_AUTOPTR(virURI) uri =3D NULL; char *ret =3D NULL; =20 if (!(uri =3D qemuBlockStorageSourceGetURI(src))) @@ -969,7 +969,6 @@ qemuBuildNetworkDriveURI(virStorageSourcePtr src, ret =3D virURIFormat(uri); =20 cleanup: - virURIFree(uri); return ret; } =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305988; cv=none; d=zoho.com; s=zohoarc; b=XvOErWINi2oq9v0nBlVurBkSjqG4BJzoI4PaXjqUeaZlCFyVrGCD+ghnbJZ6zYsuDXVxgO23qpJSJ2uE0fbBlk0UuzRvbAWnziSfkl2i+oZfnyLmK6sRCDnHDHQHdOKHc4S2rTEOK2G+wBqgrV/tywudxTQL8DYSZ9cfoaupay0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305988; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=qTlFb7lH8tjC53VVbkDUvz4AOrxDpZxwjpMK+md1Bwo=; b=G6O2sCXeGYQTZCD0HUUwdxh8f1/FX9V6cUtmL0mwXkFwSoJDz2DiPml47KPr5U6beMz0acL5NElG76ONgTilND5yQ59fZUJds9KCDAQgpew0wvX3PrILgVPL14VIWeOWLyZ7Z32qvd47y4UuOvX8PslFzvFMkXZLStDWgwx7WmE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566305988051547.7985741770661; Tue, 20 Aug 2019 05:59:48 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id F05AF106BB28; Tue, 20 Aug 2019 12:59:46 +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 CE85D8CBED; Tue, 20 Aug 2019 12:59:46 +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 9538718005A0; Tue, 20 Aug 2019 12:59:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxfq6023230 for ; Tue, 20 Aug 2019 08:59:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 710E118F1B; Tue, 20 Aug 2019 12:59:41 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECBB94274 for ; Tue, 20 Aug 2019 12:59:36 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:10 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 11/19] qemuBuildControllersByTypeCommandLine: use VIR_AUTOFREE X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.64]); Tue, 20 Aug 2019 12:59:47 +0000 (UTC) Reduce the scope of the variable to get it freed for every controller processed. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index db8584243c..298a1c3fea 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3198,12 +3198,12 @@ qemuBuildControllersByTypeCommandLine(virCommandPtr= cmd, virQEMUCapsPtr qemuCaps, virDomainControllerType type) { - char *devstr =3D NULL; int ret =3D -1; size_t i; =20 for (i =3D 0; i < def->ncontrollers; i++) { virDomainControllerDefPtr cont =3D def->controllers[i]; + VIR_AUTOFREE(char *) devstr =3D NULL; =20 if (cont->type !=3D type) continue; @@ -3236,7 +3236,6 @@ qemuBuildControllersByTypeCommandLine(virCommandPtr c= md, continue; } =20 - VIR_FREE(devstr); if (qemuBuildControllerDevStr(def, cont, qemuCaps, &devstr) < 0) goto cleanup; =20 @@ -3251,7 +3250,6 @@ qemuBuildControllersByTypeCommandLine(virCommandPtr c= md, =20 ret =3D 0; cleanup: - VIR_FREE(devstr); return ret; } =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305987; cv=none; d=zoho.com; s=zohoarc; b=Kr1ypD01PJezxRoNISzmj2e9dIY1p8S4xIFln9Ar/pQI53UFvxQIoMpXQG2Zw8J44OoW/8Xy2Ey4Db25HjIkc8yKioBnA3HedVQi+ynwHCOxGXczbw7vZDuq+4Xpo+OVo5FxgFj8GPsBtQLLw7HZo+KUo/fuLHuYmIsSdeW1Rt8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305987; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=FPSaAJ/6OGsZhdFqd5bKUubA60IhHx4xPAlP9/KWwbY=; b=nepDXh7UOobUHKysoQFtSnOO0Si+Sl/aeYFkg7ZGDLLGdlkw/80RBHV0DL8dhwsdir3XsKBYIXI6iZ0MYvie4imiFuXs+CEFBFIsKguZeBA6xmTJ78KX9FyMgRTmJ2SNPA/Mfr4pafS/buGnnzoYjbpMAcp+yVbZ8k8BLjNlb78= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15663059870041015.5771360856955; Tue, 20 Aug 2019 05:59:47 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id D8C37307D95F; Tue, 20 Aug 2019 12:59:45 +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 B4D168CBF9; Tue, 20 Aug 2019 12:59:45 +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 7AA184E58B; Tue, 20 Aug 2019 12:59:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxhme023240 for ; Tue, 20 Aug 2019 08:59:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id DCE411E4; Tue, 20 Aug 2019 12:59:43 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66F6F4274 for ; Tue, 20 Aug 2019 12:59:41 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:11 +0200 Message-Id: <7a50f1a496eeb5ad7e42c36bae62ca3d3c958850.1566305923.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 12/19] qemuBuildRNGCommandLine: use VIR_AUTOFREE X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 20 Aug 2019 12:59:46 +0000 (UTC) Use separate variables for the chardev and the device. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 298a1c3fea..67de0fc35e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6022,7 +6022,8 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager, VIR_AUTOPTR(virJSONValue) props =3D NULL; virBuffer buf =3D VIR_BUFFER_INITIALIZER; virDomainRNGDefPtr rng =3D def->rngs[i]; - char *tmp; + VIR_AUTOFREE(char *) chardev =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; int rc; =20 if (!rng->info.alias) { @@ -6033,14 +6034,12 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager, =20 /* possibly add character device for backend */ if (qemuBuildRNGBackendChrdevStr(logManager, secManager, cmd, cfg,= def, - rng, qemuCaps, &tmp, + rng, qemuCaps, &chardev, chardevStdioLogd) < 0) return -1; =20 - if (tmp) { - virCommandAddArgList(cmd, "-chardev", tmp, NULL); - VIR_FREE(tmp); - } + if (chardev) + virCommandAddArgList(cmd, "-chardev", chardev, NULL); =20 if (qemuBuildRNGBackendProps(rng, qemuCaps, &props) < 0) return -1; @@ -6057,10 +6056,9 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager, if (qemuCommandAddExtDevice(cmd, &rng->info) < 0) return -1; =20 - if (!(tmp =3D qemuBuildRNGDevStr(def, rng, qemuCaps))) + if (!(devstr =3D qemuBuildRNGDevStr(def, rng, qemuCaps))) return -1; - virCommandAddArgList(cmd, "-device", tmp, NULL); - VIR_FREE(tmp); + virCommandAddArgList(cmd, "-device", devstr, NULL); } =20 return 0; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305989; cv=none; d=zoho.com; s=zohoarc; b=gzSm09M+2jvos48EG5JjjwC9R6X4BnTQ5uuMuS9X3WhyQnR6Qk27Tsfm04yt2p3mReE7eC1es3TT4i1eGE0cb1LCtAliI7IieEiBPH+upHaqXSR1QS5wiznu+QutTxudyR9kk9/++jIRKaGExXAzoid6lk+wcVHrmkMIwMg4fEw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305989; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=YUYOuKNSmgdvHHcnAiJXYkn7N2mOseKe+8FQeW0fs5k=; b=TRktoyqEplH18q55ENOqydU1IKnBXFjyzylXXThXfvvjbf1A8q877UZtmcXlKCtLp4++T4HUtjTJBxdjpz8sG0lwaFvzHVpMMu5dHkrn2YqHhUh1zdyeS/wznLMITF5vltATGOGCE34N0E8tWn6NofC6RaxWWqZq6P4zS1IVSBY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566305989406458.87413298084675; Tue, 20 Aug 2019 05:59:49 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1B4151801594; Tue, 20 Aug 2019 12:59:48 +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 ED49787A1; Tue, 20 Aug 2019 12:59:47 +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 B89E01802216; Tue, 20 Aug 2019 12:59:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxifS023248 for ; Tue, 20 Aug 2019 08:59:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id AB7311E8; Tue, 20 Aug 2019 12:59:44 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35CB21E4 for ; Tue, 20 Aug 2019 12:59:44 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:12 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 13/19] qemuBuildSmpCommandLine: use virCommandAddArgBuffer directly X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Tue, 20 Aug 2019 12:59:48 +0000 (UTC) Instead of getting the string then passing it to virCommand. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 67de0fc35e..cc589a70b2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7606,7 +7606,6 @@ static int qemuBuildSmpCommandLine(virCommandPtr cmd, virDomainDefPtr def) { - char *smp =3D NULL; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; unsigned int maxvcpus =3D virDomainDefGetVcpusMax(def); unsigned int nvcpus =3D 0; @@ -7642,10 +7641,7 @@ qemuBuildSmpCommandLine(virCommandPtr cmd, if (virBufferCheckError(&buf) < 0) return -1; =20 - smp =3D virBufferContentAndReset(&buf); - virCommandAddArg(cmd, smp); - VIR_FREE(smp); - + virCommandAddArgBuffer(cmd, &buf); return 0; } =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305991; cv=none; d=zoho.com; s=zohoarc; b=Ea2lJ26e6W0dhhPcON5KyLgu9tKL+GlL4F5NGOO4GJTKuWqlyVb5vxJ4IETIy9grakc7vcD9+f8Ka+k6gH6D9vUth2+GnC9GzevkBpBRYD0ENsJXekR01z8eThitDC95tPsDZYQQKIcwFbQFv6Adt3Lkc2mIMcWwEx2AIDxxjM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305991; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=yek2gJK/st2OW8w+Fcdmyf5I6VDutcG/A4vmdYT5I/w=; b=M6+YVYnssrOblUIxClbDi3SHtfzOnDOIOalg6xAh9Fn86kd82mGRWxBUK8AtSAMn8BI4PUTKkSguwXsbd02T/2fbZ+8W4S58UHcGleHfjZywEwv7E4x+GGlYG7QUIdw46joQPhYwjElncbQvKyduKla5bihcDPNRPpZjZQbJ49s= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15663059913572.8934185136713495; Tue, 20 Aug 2019 05:59:51 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 3C84A8D5BAC; Tue, 20 Aug 2019 12:59:50 +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 0C9D2F6F9; Tue, 20 Aug 2019 12:59:50 +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 B2B4F4EBC4; Tue, 20 Aug 2019 12:59:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxj9m023259 for ; Tue, 20 Aug 2019 08:59:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7A9991E8; Tue, 20 Aug 2019 12:59:45 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 048071E4 for ; Tue, 20 Aug 2019 12:59:44 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:13 +0200 Message-Id: <5afce4380d2ed8cbdf05ed115ce8b5099ec2c847.1566305923.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 14/19] qemuBuildShmemCommandLine: add chardev variable X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Tue, 20 Aug 2019 12:59:50 +0000 (UTC) That way devstr will only be used for the device string. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index cc589a70b2..6557643dbe 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9197,6 +9197,7 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager, VIR_AUTOPTR(virJSONValue) memProps =3D NULL; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *devstr =3D NULL; + VIR_AUTOFREE(char *) chardev =3D NULL; int rc; unsigned int cdevflags =3D QEMU_BUILD_CHARDEV_TCP_NOWAIT | QEMU_BUILD_CHARDEV_UNIX_FD_PASS; @@ -9267,16 +9268,15 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManag= er, VIR_FREE(devstr); =20 if (shmem->server.enabled) { - devstr =3D qemuBuildChrChardevStr(logManager, secManager, + chardev =3D qemuBuildChrChardevStr(logManager, secManager, cmd, cfg, def, &shmem->server.chr, shmem->info.alias, qemuCaps, cdevflags); - if (!devstr) + if (!chardev) return -1; =20 - virCommandAddArgList(cmd, "-chardev", devstr, NULL); - VIR_FREE(devstr); + virCommandAddArgList(cmd, "-chardev", chardev, NULL); } =20 return 0; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305992; cv=none; d=zoho.com; s=zohoarc; b=Czzqvd7b2xgtEg0807sXAgNMQcYZLiHvSEVitDmOGme6VYUVcK0ZUdvlizTF9WhQuyYc13dtK9cQeTofxeJgk7EDQTYnnwU3JJLbEHvT2eKzFLYgMDBK5Yuhd+lx1osOSJASp1tQAIqoBgwohS7ybCxGjNbW/Jylp/Skygsja5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305992; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=lvr07ve2KUcnE3eFGhXTcWb91N3HmWe/oDBvVmzuAD4=; b=D09PdZoZDZB6s3WU37hxoV/MGZ/c8GROKcFdPPWO6hLECR69Nc1JMCrfuZPuQFqAFYPBbt8mtiBArRHd5ZJcVjvxC3ha51ccnntrjswffLz0e5g6HNMmn0ZhtDGf1a8p1k8RIjzqdETaimX4IcA0v4lPtlldue+3fP9xtycuX+g= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566305992989675.461623523295; Tue, 20 Aug 2019 05:59:52 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 83A0B2F30DB; Tue, 20 Aug 2019 12:59:51 +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 5B59318B69; Tue, 20 Aug 2019 12:59:51 +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 22DCB4EDA7; Tue, 20 Aug 2019 12:59:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxkt9023269 for ; Tue, 20 Aug 2019 08:59:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4A3091EA; Tue, 20 Aug 2019 12:59:46 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C747F1E8 for ; Tue, 20 Aug 2019 12:59:45 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:14 +0200 Message-Id: <8cb61e62dc2f655932a1b96d8b90d1a496f714b0.1566305923.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 15/19] qemuBuildShmemCommandLine: use VIR_AUTOFREE for devstr X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 20 Aug 2019 12:59:52 +0000 (UTC) Now that it's only used once. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6557643dbe..e47f30876e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9196,7 +9196,7 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager, { VIR_AUTOPTR(virJSONValue) memProps =3D NULL; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - char *devstr =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; VIR_AUTOFREE(char *) chardev =3D NULL; int rc; unsigned int cdevflags =3D QEMU_BUILD_CHARDEV_TCP_NOWAIT | @@ -9259,13 +9259,10 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManag= er, if (!devstr) return -1; =20 - if (qemuCommandAddExtDevice(cmd, &shmem->info) < 0) { - VIR_FREE(devstr); + if (qemuCommandAddExtDevice(cmd, &shmem->info) < 0) return -1; - } =20 virCommandAddArgList(cmd, "-device", devstr, NULL); - VIR_FREE(devstr); =20 if (shmem->server.enabled) { chardev =3D qemuBuildChrChardevStr(logManager, secManager, --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305995; cv=none; d=zoho.com; s=zohoarc; b=cAxQk4PvolJ+DDBMqwGfZx69wflj0gS4yxzsSgMpSfdydSBwWbveAK0Q0F/wckWewiIZ1VV8H0/FP8IrC0u7IoKNqLs1Fkybyikhl8dEoRRtc2c55qqx1Bc7uOLtEy6C64KtK6vlM7u21i7uiameCa1liJ0Y2KLYGGsqaRVNgQ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305995; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=gdzsL9LjVkHJ1PrNr8Nz73goxgav9/JYAw5v684hC3U=; b=H0EaIYR0C+MO6qZxGnCKE37w/w2OZGaPp0hRoVrIBmW9jQjos9AOqs0labgYN0GkoXJFNCaRJGCmNDQFLfFRZgu1MWvI2HZSgK7DVdcbvKLNN2mit8MtP0GQDLxkm38ouh7/9GaSbkZ/MBQo43OVEqy8yrl9cTY9WX+OSUlra2M= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566305995958182.8410812580595; Tue, 20 Aug 2019 05:59:55 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DB3E1C08E2B0; Tue, 20 Aug 2019 12:59:54 +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 B848717144; Tue, 20 Aug 2019 12:59:54 +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 4D4E74EE70; Tue, 20 Aug 2019 12:59:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxlf9023274 for ; Tue, 20 Aug 2019 08:59:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1A6CA1E4; Tue, 20 Aug 2019 12:59:47 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 976B71E8 for ; Tue, 20 Aug 2019 12:59:46 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:15 +0200 Message-Id: <7a19d7444d17e45a1ca1596319fe8682f5b205c3.1566305923.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 16/19] qemu_command: use VIR_AUTOUNREF X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 20 Aug 2019 12:59:55 +0000 (UTC) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e47f30876e..a4df133ca0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6900,7 +6900,7 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver, { int ret =3D -1; size_t i; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; virCPUDefPtr cpu =3D def->cpu; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) @@ -6978,7 +6978,6 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver, =20 ret =3D 0; cleanup: - virObjectUnref(caps); return ret; } =20 @@ -8486,7 +8485,7 @@ qemuInterfaceVhostuserConnect(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps, char **chardev) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); int ret =3D -1; =20 switch ((virDomainChrType)net->data.vhostuser->type) { @@ -8519,7 +8518,6 @@ qemuInterfaceVhostuserConnect(virQEMUDriverPtr driver, =20 ret =3D 0; cleanup: - virObjectUnref(cfg); return ret; } =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305999; cv=none; d=zoho.com; s=zohoarc; b=VNMOo8JwbkiVg/gCheV42+0naG3DWTKHjV93yCOT33inDbJ19qTfcLpNQ4VEkklhL2I/OX4OvxYHDaKlDRAnu3SdzLuzg590xDFDWbWsK8Mto+01shwZdd6o7rmLmxFsqvCokJPHGqlC6dGip6k2n5Duo0EBlBSzYSTr1hvEAfc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305999; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=gE+krbTIXt2EfiDaZ2RVIGrU/rqNW7x6+ljW0u9g2S4=; b=M0rGWFO2BJmU3UD8zNXn/7hDmUlXiMowIgQn8e1YkTXus9l6wEPhL9GJghfuJrdn9l2dg1R9UIQmz6jkXh1yNlkb3oSWjqFxEGh9mBiWPetlZA+CAT9hizY7gUeboz/FuLT5GzzYqUwP7PG0QYaaAcd5Wlk3z6Fu4uBsCRbWucY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566305999396182.70220246855445; Tue, 20 Aug 2019 05:59:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0A955C0546F2; Tue, 20 Aug 2019 12:59:58 +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 D48104274; Tue, 20 Aug 2019 12:59:57 +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 96EA5180BAA1; Tue, 20 Aug 2019 12:59:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxmql023283 for ; Tue, 20 Aug 2019 08:59:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 396C013836; Tue, 20 Aug 2019 12:59:48 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 68AFC1E4 for ; Tue, 20 Aug 2019 12:59:47 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:16 +0200 Message-Id: <4968e1eccfda0d90de9213f7c2090a12d9951892.1566305923.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 17/19] qemu_command: remove unnecessary labels and ret variables X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 20 Aug 2019 12:59:58 +0000 (UTC) The recent cleanups allow us to clean up the code a bit. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 741 +++++++++++++++------------------------- 1 file changed, 274 insertions(+), 467 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a4df133ca0..0e9bd77f62 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -202,7 +202,6 @@ static int qemuBuildMasterKeyCommandLine(virCommandPtr cmd, qemuDomainObjPrivatePtr priv) { - int ret =3D -1; VIR_AUTOFREE(char *) alias =3D NULL; VIR_AUTOFREE(char *) path =3D NULL; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; @@ -225,17 +224,14 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd, * existence of socket files before using. */ if (!(path =3D qemuDomainGetMasterKeyFilePath(priv->libDir))) - goto cleanup; + return -1; =20 virCommandAddArg(cmd, "-object"); virBufferAsprintf(&buf, "secret,id=3D%s,format=3Draw,file=3D", alias); virQEMUBuildBufferEscapeComma(&buf, path); virCommandAddArgBuffer(cmd, &buf); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -298,7 +294,6 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, virDomainDeviceInfoPtr info, virQEMUCapsPtr qemuCaps) { - int ret =3D -1; VIR_AUTOFREE(char *) devStr =3D NULL; const char *contAlias =3D NULL; bool contIsPHB =3D false; @@ -308,7 +303,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, size_t i; =20 if (!(devStr =3D virPCIDeviceAddressAsString(&info->addr.pci))) - goto cleanup; + return -1; for (i =3D 0; i < domainDef->ncontrollers; i++) { virDomainControllerDefPtr cont =3D domainDef->controllers[i]; =20 @@ -324,7 +319,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, "controller with index %u required " "for device at address %s"), info->addr.pci.bus, devStr); - goto cleanup; + return -1; } =20 if (virDomainDeviceAliasIsUserAlias(contAlias)) { @@ -350,7 +345,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, "controller with index %u required " "for device at address %s"), info->addr.pci.bus, devStr); - goto cleanup; + return -1; } =20 if (contIsPHB && contTargetIndex > 0) { @@ -376,7 +371,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, if (!(contAlias =3D virDomainControllerAliasFind(domainDef, VIR_DOMAIN_CONTROLL= ER_TYPE_USB, info->addr.usb.bus)= )) - goto cleanup; + return -1; virBufferAsprintf(buf, ",bus=3D%s.0", contAlias); if (virDomainUSBAddressPortIsValid(info->addr.usb.port)) { virBufferAddLit(buf, ",port=3D"); @@ -397,9 +392,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, info->addr.isa.irq); } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -733,22 +726,18 @@ qemuBuildObjectSecretCommandLine(virCommandPtr cmd, qemuDomainSecretInfoPtr secinfo) { VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - int ret =3D -1; VIR_AUTOPTR(virJSONValue) props =3D NULL; =20 if (qemuBuildSecretInfoProps(secinfo, &props) < 0) return -1; =20 if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0) - goto cleanup; + return -1; =20 virCommandAddArg(cmd, "-object"); virCommandAddArgBuffer(cmd, &buf); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -929,23 +918,19 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - int ret =3D -1; VIR_AUTOPTR(virJSONValue) props =3D NULL; =20 if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer, alias, certEncSecretAlias, qemuCaps, &props)= < 0) - goto cleanup; + return -1; =20 if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0) - goto cleanup; + return -1; =20 virCommandAddArg(cmd, "-object"); virCommandAddArgBuffer(cmd, &buf); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -954,22 +939,18 @@ qemuBuildNetworkDriveURI(virStorageSourcePtr src, qemuDomainSecretInfoPtr secinfo) { VIR_AUTOPTR(virURI) uri =3D NULL; - char *ret =3D NULL; =20 if (!(uri =3D qemuBlockStorageSourceGetURI(src))) - goto cleanup; + return NULL; =20 if (src->hosts->socket && virAsprintf(&uri->query, "socket=3D%s", src->hosts->socket) < 0) - goto cleanup; + return NULL; =20 if (qemuBuildGeneralSecinfoURI(uri, secinfo) < 0) - goto cleanup; - - ret =3D virURIFormat(uri); + return NULL; =20 - cleanup: - return ret; + return virURIFormat(uri); } =20 =20 @@ -977,9 +958,9 @@ static char * qemuBuildNetworkDriveStr(virStorageSourcePtr src, qemuDomainSecretInfoPtr secinfo) { - char *ret =3D NULL; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t i; + char *ret =3D NULL; =20 switch ((virStorageNetProtocol) src->protocol) { case VIR_STORAGE_NET_PROTOCOL_NBD: @@ -987,7 +968,7 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, virReportError(VIR_ERR_INTERNAL_ERROR, _("protocol '%s' accepts only one host"), virStorageNetProtocolTypeToString(src->prot= ocol)); - goto cleanup; + return NULL; } =20 if (!((src->hosts->name && strchr(src->hosts->name, ':')) || @@ -1010,7 +991,7 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("socket attribute required for " "unix transport")); - goto cleanup; + return NULL; } =20 virBufferAsprintf(&buf, "unix:%s", src->hosts->socket); @@ -1020,17 +1001,16 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, virReportError(VIR_ERR_INTERNAL_ERROR, _("nbd does not support transport '%s'"= ), virStorageNetHostTransportTypeToString(= src->hosts->transport)); - goto cleanup; + return NULL; } =20 if (src->path) virBufferAsprintf(&buf, ":exportname=3D%s", src->path); =20 if (virBufferCheckError(&buf) < 0) - goto cleanup; + return NULL; =20 - ret =3D virBufferContentAndReset(&buf); - goto cleanup; + return virBufferContentAndReset(&buf); } /* NBD code uses URI formatting scheme as others in some cases= */ ret =3D qemuBuildNetworkDriveURI(src, secinfo); @@ -1050,21 +1030,21 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, if (!src->path) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing disk source for 'sheepdog' proto= col")); - goto cleanup; + return NULL; } =20 if (src->nhosts =3D=3D 0) { if (virAsprintf(&ret, "sheepdog:%s", src->path) < 0) - goto cleanup; + return NULL; } else if (src->nhosts =3D=3D 1) { if (virAsprintf(&ret, "sheepdog:%s:%u:%s", src->hosts->name, src->hosts->port, src->path) < 0) - goto cleanup; + return NULL; } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("protocol 'sheepdog' accepts up to one ho= st")); - goto cleanup; + return NULL; } =20 break; @@ -1074,7 +1054,7 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("':' not allowed in RBD source volume nam= e '%s'"), src->path); - goto cleanup; + return NULL; } =20 virBufferStrcat(&buf, "rbd:", src->volume, "/", src->path, NUL= L); @@ -1083,7 +1063,7 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, virBufferEscape(&buf, '\\', ":", "@%s", src->snapshot); =20 if (qemuBuildRBDSecinfoURI(&buf, secinfo) < 0) - goto cleanup; + return NULL; =20 if (src->nhosts > 0) { virBufferAddLit(&buf, ":mon_host=3D"); @@ -1107,7 +1087,7 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, virBufferEscape(&buf, '\\', ":", ":conf=3D%s", src->config= File); =20 if (virBufferCheckError(&buf) < 0) - goto cleanup; + return NULL; =20 ret =3D virBufferContentAndReset(&buf); break; @@ -1115,23 +1095,21 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_VXHS: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("VxHS protocol does not support URI syntax")); - goto cleanup; + return NULL; =20 case VIR_STORAGE_NET_PROTOCOL_SSH: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("'ssh' protocol is not yet supported")); - goto cleanup; + return NULL; =20 case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected network protocol '%s'"), virStorageNetProtocolTypeToString(src->protocol= )); - goto cleanup; + return NULL; } =20 - cleanup: - return ret; } =20 @@ -1142,7 +1120,6 @@ qemuGetDriveSourceString(virStorageSourcePtr src, char **source) { int actualType =3D virStorageSourceGetActualType(src); - int ret =3D -1; =20 *source =3D NULL; =20 @@ -1155,13 +1132,13 @@ qemuGetDriveSourceString(virStorageSourcePtr src, case VIR_STORAGE_TYPE_FILE: case VIR_STORAGE_TYPE_DIR: if (VIR_STRDUP(*source, src->path) < 0) - goto cleanup; + return -1; =20 break; =20 case VIR_STORAGE_TYPE_NETWORK: if (!(*source =3D qemuBuildNetworkDriveStr(src, secinfo))) - goto cleanup; + return -1; break; =20 case VIR_STORAGE_TYPE_VOLUME: @@ -1170,10 +1147,7 @@ qemuGetDriveSourceString(virStorageSourcePtr src, break; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -1510,18 +1484,16 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk, bool qemuCheckFips(void) { - bool ret =3D false; - if (virFileExists("/proc/sys/crypto/fips_enabled")) { VIR_AUTOFREE(char *) buf =3D NULL; =20 if (virFileReadAll("/proc/sys/crypto/fips_enabled", 10, &buf) < 0) - return ret; + return false; if (STREQ(buf, "1\n")) - ret =3D true; + return true; } =20 - return ret; + return false; } =20 =20 @@ -1635,7 +1607,6 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, VIR_AUTOPTR(virJSONValue) srcprops =3D NULL; VIR_AUTOFREE(char *) source =3D NULL; bool rawluks =3D false; - int ret =3D -1; =20 if (srcpriv) { secinfo =3D srcpriv->secinfo; @@ -1644,19 +1615,18 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, =20 if (qemuDiskSourceNeedsProps(disk->src, qemuCaps) && !(srcprops =3D qemuDiskSourceGetProps(disk->src))) - goto cleanup; + return -1; =20 if (!srcprops && qemuGetDriveSourceString(disk->src, secinfo, &source) < 0) - goto cleanup; + return -1; =20 /* nothing to format if the drive is empty */ if (!(source || srcprops) || ((disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY || disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM) && disk->tray_status =3D=3D VIR_DOMAIN_DISK_TRAY_OPEN)) { - ret =3D 0; - goto cleanup; + return 0; } =20 if (actualType =3D=3D VIR_STORAGE_TYPE_BLOCK && @@ -1665,7 +1635,7 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, disk->src->type =3D=3D VIR_STORAGE_TYPE_VOLUME ? _("tray status 'open' is invalid for block type vol= ume") : _("tray status 'open' is invalid for block type dis= k")); - goto cleanup; + return -1; } =20 if (source) { @@ -1688,10 +1658,10 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, virBufferAsprintf(buf, ",file.debug=3D%d", disk->src->debugLev= el); =20 if (qemuBuildDriveSourcePR(buf, disk) < 0) - goto cleanup; + return -1; } else { if (!(source =3D virQEMUBuildDriveCommandlineFromJSON(srcprops))) - goto cleanup; + return -1; =20 virBufferAdd(buf, source, -1); } @@ -1716,10 +1686,7 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, virBufferAsprintf(buf, "format=3D%s,", qemuformat); } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -2392,7 +2359,6 @@ qemuBuildFloppyCommandLineControllerOptions(virComman= dPtr cmd, VIR_AUTOFREE(char *) backendStr =3D NULL; VIR_AUTOFREE(char *) bootindexStr =3D NULL; size_t i; - int ret =3D -1; =20 virBufferAddLit(&fdc_opts, "isa-fdc,"); =20 @@ -2418,16 +2384,16 @@ qemuBuildFloppyCommandLineControllerOptions(virComm= andPtr cmd, =20 if (bootindex && virAsprintf(&bootindexStr, "bootindex%c=3D%u", driveLetter, bo= otindex) < 0) - goto cleanup; + return -1; =20 /* with -blockdev we setup the floppy device and it's backend with= -device */ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) { if (qemuDomainDiskGetBackendAlias(disk, qemuCaps, &backendAlia= s) < 0) - goto cleanup; + return -1; =20 if (backendAlias && virAsprintf(&backendStr, "drive%c=3D%s", driveLetter, back= endAlias) < 0) - goto cleanup; + return -1; } =20 if (!explicitfdc) { @@ -2457,10 +2423,7 @@ qemuBuildFloppyCommandLineControllerOptions(virComma= ndPtr cmd, virCommandAddArgBuffer(cmd, &fdc_opts); } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -2922,7 +2885,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_NON_TRANSITIONAL: if (qemuBuildVirtioDevStr(&buf, "virtio-scsi", qemuCaps, VIR_DOMAIN_DEVICE_CONTROLLER, def) <= 0) { - goto error; + return -1; } =20 if (def->iothread) { @@ -2931,7 +2894,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, } =20 if (qemuBuildVirtioOptionsStr(&buf, def->virtio, qemuCaps) < 0) - goto error; + return -1; break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC: virBufferAddLit(&buf, "lsi"); @@ -2951,13 +2914,13 @@ qemuBuildControllerDevStr(const virDomainDef *domai= nDef, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported controller model: %s"), virDomainControllerModelSCSITypeToString(def->m= odel)); - goto error; + return -1; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected SCSI controller model %d"), def->model); - goto error; + return -1; } virBufferAsprintf(&buf, ",id=3D%s", def->info.alias); break; @@ -2965,7 +2928,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: if (qemuBuildVirtioDevStr(&buf, "virtio-serial", qemuCaps, VIR_DOMAIN_DEVICE_CONTROLLER, def) < 0) { - goto error; + return -1; } =20 virBufferAsprintf(&buf, ",id=3D%s", def->info.alias); @@ -2978,7 +2941,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, def->opts.vioserial.vectors); } if (qemuBuildVirtioOptionsStr(&buf, def->virtio, qemuCaps) < 0) - goto error; + return -1; break; =20 case VIR_DOMAIN_CONTROLLER_TYPE_CCID: @@ -2991,7 +2954,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, =20 case VIR_DOMAIN_CONTROLLER_TYPE_USB: if (qemuBuildUSBControllerDevStr(domainDef, def, qemuCaps, &buf) = =3D=3D -1) - goto error; + return -1; =20 break; =20 @@ -3003,7 +2966,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, if (def->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT && pciopts->modelName =3D=3D VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME= _SPAPR_PCI_HOST_BRIDGE && pciopts->targetIndex =3D=3D 0) { - goto done; + return 0; } =20 if (!modelName) { @@ -3051,13 +3014,13 @@ qemuBuildControllerDevStr(const virDomainDef *domai= nDef, case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Unsupported PCI Express root controller")); - goto error; + return -1; case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected PCI controller model %d"), def->model); - goto error; + return -1; } break; } @@ -3069,7 +3032,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported controller type: %s"), virDomainControllerTypeToString(def->type)); - goto error; + return -1; } =20 if (def->queues) @@ -3084,17 +3047,13 @@ qemuBuildControllerDevStr(const virDomainDef *domai= nDef, qemuBuildIoEventFdStr(&buf, def->ioeventfd, qemuCaps); =20 if (qemuBuildDeviceAddressStr(&buf, domainDef, &def->info, qemuCaps) <= 0) - goto error; + return -1; =20 - done: if (virBufferCheckError(&buf) < 0) - goto error; + return -1; =20 *devstr =3D virBufferContentAndReset(&buf); return 0; - - error: - return -1; } =20 =20 @@ -3198,7 +3157,6 @@ qemuBuildControllersByTypeCommandLine(virCommandPtr c= md, virQEMUCapsPtr qemuCaps, virDomainControllerType type) { - int ret =3D -1; size_t i; =20 for (i =3D 0; i < def->ncontrollers; i++) { @@ -3237,20 +3195,18 @@ qemuBuildControllersByTypeCommandLine(virCommandPtr= cmd, } =20 if (qemuBuildControllerDevStr(def, cont, qemuCaps, &devstr) < 0) - goto cleanup; + return -1; =20 if (devstr) { if (qemuCommandAddExtDevice(cmd, &cont->info) < 0) - goto cleanup; + return -1; =20 virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, devstr); } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -3286,20 +3242,16 @@ qemuBuildControllersCommandLine(virCommandPtr cmd, VIR_DOMAIN_CONTROLLER_TYPE_SATA, VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL, }; - int ret =3D -1; =20 for (i =3D 0; i < ARRAY_CARDINALITY(contOrder); i++) { if (qemuBuildControllersByTypeCommandLine(cmd, def, qemuCaps, cont= Order[i]) < 0) - goto cleanup; + return -1; } =20 if (qemuBuildLegacyUSBControllerCommandLine(cmd, def) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -3681,7 +3633,6 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf, { VIR_AUTOPTR(virJSONValue) props =3D NULL; VIR_AUTOFREE(char *) alias =3D NULL; - int ret =3D -1; =20 if (!mem->info.alias) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -3690,20 +3641,16 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf, } =20 if (virAsprintf(&alias, "mem%s", mem->info.alias) < 0) - goto cleanup; + return -1; =20 if (qemuBuildMemoryBackendProps(&props, alias, cfg, priv, def, mem, true) < 0) - goto cleanup; + return -1; =20 if (virQEMUBuildObjectCommandlineFromJSON(buf, props) < 0) - goto cleanup; - - ret =3D 0; - - cleanup: + return -1; =20 - return ret; + return 0; } =20 =20 @@ -4121,20 +4068,17 @@ qemuBuildWatchdogDevStr(const virDomainDef *def, if (!model) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing watchdog model")); - goto error; + return NULL; } =20 virBufferAsprintf(&buf, "%s,id=3D%s", model, dev->info.alias); if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) - goto error; + return NULL; =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -4194,12 +4138,12 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, if (qemuBuildVirtioDevStr(&buf, "virtio-balloon", qemuCaps, VIR_DOMAIN_DEVICE_MEMBALLOON, def->memballoon) < 0) { - goto error; + return -1; } =20 virBufferAsprintf(&buf, ",id=3D%s", def->memballoon->info.alias); if (qemuBuildDeviceAddressStr(&buf, def, &def->memballoon->info, qemuC= aps) < 0) - goto error; + return -1; =20 if (def->memballoon->autodeflate !=3D VIR_TRISTATE_SWITCH_ABSENT) { virBufferAsprintf(&buf, ",deflate-on-oom=3D%s", @@ -4207,17 +4151,14 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, } =20 if (qemuBuildVirtioOptionsStr(&buf, def->memballoon->virtio, qemuCaps)= < 0) - goto error; + return -1; =20 if (qemuCommandAddExtDevice(cmd, &def->memballoon->info) < 0) - goto error; + return -1; =20 virCommandAddArg(cmd, "-device"); virCommandAddArgBuffer(cmd, &buf); return 0; - - error: - return -1; } =20 =20 @@ -4233,16 +4174,13 @@ qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev) } else { virReportError(VIR_ERR_XML_ERROR, "%s", _("nvram address type must be spaprvio")); - goto error; + return NULL; } =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -4289,31 +4227,31 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, case VIR_DOMAIN_INPUT_TYPE_MOUSE: if (qemuBuildVirtioDevStr(&buf, "virtio-mouse", qemuCaps, VIR_DOMAIN_DEVICE_INPUT, dev) < 0) { - goto error; + return NULL; } break; case VIR_DOMAIN_INPUT_TYPE_TABLET: if (qemuBuildVirtioDevStr(&buf, "virtio-tablet", qemuCaps, VIR_DOMAIN_DEVICE_INPUT, dev) < 0) { - goto error; + return NULL; } break; case VIR_DOMAIN_INPUT_TYPE_KBD: if (qemuBuildVirtioDevStr(&buf, "virtio-keyboard", qemuCaps, VIR_DOMAIN_DEVICE_INPUT, dev) < 0) { - goto error; + return NULL; } break; case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: if (qemuBuildVirtioDevStr(&buf, "virtio-input-host", qemuCaps, VIR_DOMAIN_DEVICE_INPUT, dev) < 0) { - goto error; + return NULL; } break; case VIR_DOMAIN_INPUT_TYPE_LAST: default: virReportEnumRangeError(virDomainInputType, dev->type); - goto error; + return NULL; } =20 virBufferAsprintf(&buf, ",id=3D%s", dev->info.alias); @@ -4324,18 +4262,15 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, } =20 if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildVirtioOptionsStr(&buf, dev->virtio, qemuCaps) < 0) - goto error; + return NULL; =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 static char * @@ -4357,22 +4292,19 @@ qemuBuildUSBInputDevStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("usb keyboard is not supported by this " "QEMU binary")); - goto error; + return NULL; } virBufferAsprintf(&buf, "usb-kbd,id=3D%s", dev->info.alias); break; } =20 if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) - goto error; + return NULL; =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -4449,7 +4381,7 @@ qemuBuildSoundDevStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("usb-audio controller is not supported " "by this QEMU binary")); - goto error; + return NULL; } break; case VIR_DOMAIN_SOUND_MODEL_ICH9: @@ -4458,7 +4390,7 @@ qemuBuildSoundDevStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("The ich9-intel-hda audio controller " "is not supported in this QEMU binary")); - goto error; + return NULL; } break; case VIR_DOMAIN_SOUND_MODEL_SB16: @@ -4469,20 +4401,17 @@ qemuBuildSoundDevStr(const virDomainDef *def, virReportError(VIR_ERR_INTERNAL_ERROR, _("sound card model '%s' is not supported by qemu"), virDomainSoundModelTypeToString(sound->model)); - goto error; + return NULL; } =20 virBufferAsprintf(&buf, "%s,id=3D%s", model, sound->info.alias); if (qemuBuildDeviceAddressStr(&buf, def, &sound->info, qemuCaps) < 0) - goto error; + return NULL; =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -4518,16 +4447,13 @@ qemuBuildSoundCodecStr(virDomainSoundDefPtr sound, if (flags =3D=3D -1 || !virQEMUCapsGet(qemuCaps, flags)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("%s not supported in this QEMU binary"), stype); - goto error; + return NULL; } =20 virBufferAsprintf(&buf, "%s,id=3D%s-codec%d,bus=3D%s.0,cad=3D%d", stype, sound->info.alias, codec->cad, sound->info.al= ias, codec->cad); =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -4615,13 +4541,13 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid model for video type '%s'"), virDomainVideoTypeToString(video->type)); - goto error; + return NULL; } =20 if (STREQ(model, "virtio-gpu")) { if (qemuBuildVirtioDevStr(&buf, "virtio-gpu", qemuCaps, VIR_DOMAIN_DEVICE_VIDEO, video) < 0) { - goto error; + return NULL; } } else { virBufferAsprintf(&buf, "%s", model); @@ -4676,18 +4602,15 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, } =20 if (qemuBuildDeviceAddressStr(&buf, def, &video->info, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildVirtioOptionsStr(&buf, video->virtio, qemuCaps) < 0) - goto error; + return NULL; =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -4870,7 +4793,7 @@ qemuBuildPCIHostdevDevStr(const virDomainDef *def, virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid PCI passthrough type '%s'"), virDomainHostdevSubsysPCIBackendTypeToString(backen= d)); - goto error; + return NULL; } =20 virBufferAddLit(&buf, ",host=3D"); @@ -4886,17 +4809,14 @@ qemuBuildPCIHostdevDevStr(const virDomainDef *def, if (bootIndex) virBufferAsprintf(&buf, ",bootindex=3D%u", bootIndex); if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0) - goto error; + return NULL; if (qemuBuildRomStr(&buf, dev->info) < 0) - goto error; + return NULL; =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -4924,15 +4844,12 @@ qemuBuildUSBHostdevDevStr(const virDomainDef *def, virBufferAsprintf(&buf, ",bootindex=3D%u", dev->info->bootIndex); =20 if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0) - goto error; + return NULL; =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -4947,27 +4864,24 @@ qemuBuildHubDevStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("hub type %s not supported"), virDomainHubTypeToString(dev->type)); - goto error; + return NULL; } =20 if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_HUB)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("usb-hub not supported by QEMU binary")); - goto error; + return NULL; } =20 virBufferAddLit(&buf, "usb-hub"); virBufferAsprintf(&buf, ",id=3D%s", dev->info.alias); if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) - goto error; + return NULL; =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -5009,7 +4923,6 @@ static char * qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps) { - char *ret =3D NULL; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) netsource =3D NULL; VIR_AUTOPTR(virJSONValue) srcprops =3D NULL; @@ -5020,27 +4933,24 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDef= Ptr dev, =20 if (qemuDiskSourceNeedsProps(iscsisrc->src, qemuCaps)) { if (!(srcprops =3D qemuDiskSourceGetProps(iscsisrc->src))) - goto cleanup; + return NULL; if (!(netsource =3D virQEMUBuildDriveCommandlineFromJSON(srcprops)= )) - goto cleanup; + return NULL; virBufferAsprintf(&buf, "%s,if=3Dnone,format=3Draw", netsource); } else { /* Rather than pull what we think we want - use the network disk c= ode */ if (!(netsource =3D qemuBuildNetworkDriveStr(iscsisrc->src, srcPri= v ? srcPriv->secinfo : NULL= ))) - goto cleanup; + return NULL; virBufferAddLit(&buf, "file=3D"); virQEMUBuildBufferEscapeComma(&buf, netsource); virBufferAddLit(&buf, ",if=3Dnone,format=3Draw"); } =20 if (virBufferCheckError(&buf) < 0) - goto cleanup; - - ret =3D virBufferContentAndReset(&buf); + return NULL; =20 - cleanup: - return ret; + return virBufferContentAndReset(&buf); } =20 char * @@ -5055,12 +4965,12 @@ qemuBuildSCSIVHostHostdevDevStr(const virDomainDef = *def, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VHOST_SCSI)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support vhost-scsi devices")); - goto cleanup; + return NULL; } =20 if (qemuBuildVirtioDevStr(&buf, "vhost-scsi", qemuCaps, VIR_DOMAIN_DEVICE_HOSTDEV, dev) < 0) { - goto cleanup; + return NULL; } =20 virBufferAsprintf(&buf, ",wwpn=3D%s,vhostfd=3D%s,id=3D%s", @@ -5069,15 +4979,12 @@ qemuBuildSCSIVHostHostdevDevStr(const virDomainDef = *def, dev->info->alias); =20 if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0) - goto cleanup; + return NULL; =20 if (virBufferCheckError(&buf) < 0) - goto cleanup; + return NULL; =20 return virBufferContentAndReset(&buf); - - cleanup: - return NULL; } =20 char * @@ -5091,27 +4998,25 @@ qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr d= ev, =20 if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISC= SI) { if (!(source =3D qemuBuildSCSIiSCSIHostdevDrvStr(dev, qemuCaps))) - goto error; + return NULL; virBufferAdd(&buf, source, -1); } else { if (!(source =3D qemuBuildSCSIHostHostdevDrvStr(dev))) - goto error; + return NULL; virBufferAsprintf(&buf, "file=3D/dev/%s,if=3Dnone,format=3Draw", s= ource); } =20 if (!(drivealias =3D qemuAliasFromHostdev(dev))) - goto error; + return NULL; virBufferAsprintf(&buf, ",id=3D%s", drivealias); =20 if (dev->readonly) virBufferAddLit(&buf, ",readonly=3Don"); =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - error: - return NULL; } =20 char * @@ -5125,21 +5030,21 @@ qemuBuildSCSIHostdevDevStr(const virDomainDef *def, =20 model =3D qemuDomainFindSCSIControllerModel(def, dev->info); if (model < 0) - goto error; + return NULL; =20 if (model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) { if (dev->info->addr.drive.target !=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("target must be 0 for scsi host device " "if its controller model is 'lsilogic'")); - goto error; + return NULL; } =20 if (dev->info->addr.drive.unit > 7) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unit must be not more than 7 for scsi host " "device if its controller model is 'lsilogic'= ")); - goto error; + return NULL; } } =20 @@ -5147,7 +5052,7 @@ qemuBuildSCSIHostdevDevStr(const virDomainDef *def, =20 if (!(contAlias =3D virDomainControllerAliasFind(def, VIR_DOMAIN_CONTR= OLLER_TYPE_SCSI, dev->info->addr.drive.c= ontroller))) - goto error; + return NULL; =20 if (model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) { virBufferAsprintf(&buf, ",bus=3D%s.%d,scsi-id=3D%d", @@ -5163,18 +5068,16 @@ qemuBuildSCSIHostdevDevStr(const virDomainDef *def, } =20 if (!(driveAlias =3D qemuAliasFromHostdev(dev))) - goto error; + return NULL; virBufferAsprintf(&buf, ",drive=3D%s,id=3D%s", driveAlias, dev->info->= alias); =20 if (dev->info->bootIndex) virBufferAsprintf(&buf, ",bootindex=3D%u", dev->info->bootIndex); =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - error: - return NULL; } =20 static int @@ -5320,10 +5223,9 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; bool telnet; VIR_AUTOFREE(char *) charAlias =3D NULL; - char *ret =3D NULL; =20 if (!(charAlias =3D qemuAliasChardevFromDevAlias(alias))) - goto cleanup; + return NULL; =20 switch (dev->type) { case VIR_DOMAIN_CHR_TYPE_NULL: @@ -5352,14 +5254,14 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FILE_APPEND)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("append not supported in this QEMU binary")); - goto cleanup; + return NULL; } if (qemuBuildChrChardevFileStr(flags & QEMU_BUILD_CHARDEV_FILE_LOG= D ? logManager : NULL, cmd, def, &buf, "path", dev->data.file.path, "append", dev->data.file.append) < = 0) - goto cleanup; + return NULL; break; =20 case VIR_DOMAIN_CHR_TYPE_PIPE: @@ -5420,20 +5322,20 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, if (chrSourcePriv && chrSourcePriv->secinfo) { if (qemuBuildObjectSecretCommandLine(cmd, chrSourcePriv->secinf= o) < 0) - goto cleanup; + return NULL; =20 tlsCertEncSecAlias =3D chrSourcePriv->secinfo->s.aes.alias; } =20 if (!(objalias =3D qemuAliasTLSObjFromSrcAlias(charAlias))) - goto cleanup; + return NULL; =20 if (qemuBuildTLSx509CommandLine(cmd, cfg->chardevTLSx509certdi= r, dev->data.tcp.listen, cfg->chardevTLSx509verify, tlsCertEncSecAlias, objalias, qemuCaps) < 0) { - goto cleanup; + return NULL; } =20 virBufferAsprintf(&buf, ",tls-creds=3D%s", objalias); @@ -5446,14 +5348,14 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, (flags & QEMU_BUILD_CHARDEV_UNIX_FD_PASS) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) { if (qemuSecuritySetSocketLabel(secManager, (virDomainDefPtr)de= f) < 0) - goto cleanup; + return NULL; int fd =3D qemuOpenChrChardevUNIXSocket(dev); if (qemuSecurityClearSocketLabel(secManager, (virDomainDefPtr)= def) < 0) { VIR_FORCE_CLOSE(fd); - goto cleanup; + return NULL; } if (fd < 0) - goto cleanup; + return NULL; =20 virBufferAsprintf(&buf, ",fd=3D%d", fd); =20 @@ -5485,27 +5387,25 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported chardev '%s'"), virDomainChrTypeToString(dev->type)); - goto cleanup; + return NULL; } =20 if (dev->logfile) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_LOGFILE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("logfile not supported in this QEMU binary")); - goto cleanup; + return NULL; } if (qemuBuildChrChardevFileStr(logManager, cmd, def, &buf, "logfile", dev->logfile, "logappend", dev->logappend) < 0) - goto cleanup; + return NULL; } =20 if (virBufferCheckError(&buf) < 0) - goto cleanup; + return NULL; =20 - ret =3D virBufferContentAndReset(&buf); - cleanup: - return ret; + return virBufferContentAndReset(&buf); } =20 char * @@ -5515,17 +5415,16 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *= def, { VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysMediatedDevPtr mdevsrc =3D &dev->source.subsys.u= .mdev; - char *ret =3D NULL; VIR_AUTOFREE(char *) mdevPath =3D NULL; const char *dev_str =3D NULL; =20 if (!(mdevPath =3D virMediatedDeviceGetSysfsPath(mdevsrc->uuidstr))) - goto cleanup; + return NULL; =20 dev_str =3D virMediatedDeviceModelTypeToString(mdevsrc->model); =20 if (!dev_str) - goto cleanup; + return NULL; =20 virBufferAdd(&buf, dev_str, -1); virBufferAsprintf(&buf, ",id=3D%s,sysfsdev=3D%s", dev->info->alias, md= evPath); @@ -5535,15 +5434,12 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *= def, virTristateSwitchTypeToString(mdevsrc->display)); =20 if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0) - goto cleanup; + return NULL; =20 if (virBufferCheckError(&buf) < 0) - goto cleanup; - - ret =3D virBufferContentAndReset(&buf); + return NULL; =20 - cleanup: - return ret; + return virBufferContentAndReset(&buf); } =20 static int @@ -5798,13 +5694,13 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef = *def, if (dev->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERI= AL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virtio serial device has invalid addre= ss type")); - goto error; + return NULL; } =20 contAlias =3D virDomainControllerAliasFind(def, VIR_DOMAIN_CONTROL= LER_TYPE_VIRTIO_SERIAL, dev->info.addr.vioserial.= controller); if (!contAlias) - goto error; + return NULL; =20 virBufferAsprintf(&buf, ",bus=3D%s.%d,nr=3D%d", contAlias, dev->info.addr.vioserial.bus, @@ -5818,7 +5714,7 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef *d= ef, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported spicevmc target name '%s'"), dev->target.name); - goto error; + return NULL; } =20 virBufferAsprintf(&buf, ",chardev=3Dchar%s,id=3D%s", @@ -5830,12 +5726,9 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef *= def, ? dev->target.name : "com.redhat.spice.0"); } if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 static char * @@ -5854,17 +5747,14 @@ qemuBuildSclpDevStr(virDomainChrDefPtr dev) } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Cannot use slcp with devices other than console"= )); - goto error; + return NULL; } virBufferAsprintf(&buf, ",chardev=3Dchar%s,id=3D%s", dev->info.alias, dev->info.alias); if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -5913,10 +5803,9 @@ qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, { VIR_AUTOFREE(char *) objAlias =3D NULL; VIR_AUTOFREE(char *) charBackendAlias =3D NULL; - int ret =3D -1; =20 if (virAsprintf(&objAlias, "obj%s", rng->info.alias) < 0) - goto cleanup; + return -1; =20 switch ((virDomainRNGBackend) rng->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: @@ -5924,13 +5813,13 @@ qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("this qemu doesn't support the rng-random " "backend")); - goto cleanup; + return -1; } =20 if (qemuMonitorCreateObjectProps(props, "rng-random", objAlias, "s:filename", rng->source.file, NULL) < 0) - goto cleanup; + return -1; =20 break; =20 @@ -5939,29 +5828,26 @@ qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("this qemu doesn't support the rng-egd " "backend")); - goto cleanup; + return -1; } =20 if (!(charBackendAlias =3D qemuAliasChardevFromDevAlias(rng->info.= alias))) - goto cleanup; + return -1; =20 if (qemuMonitorCreateObjectProps(props, "rng-egd", objAlias, "s:chardev", charBackendAlias, NULL) < 0) - goto cleanup; + return -1; =20 break; =20 case VIR_DOMAIN_RNG_BACKEND_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unknown rng-random backend")); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -5974,11 +5860,11 @@ qemuBuildRNGDevStr(const virDomainDef *def, =20 if (!qemuDomainCheckCCWS390AddressSupport(def, &dev->info, qemuCaps, dev->source.file)) - goto error; + return NULL; =20 if (qemuBuildVirtioDevStr(&buf, "virtio-rng", qemuCaps, VIR_DOMAIN_DEVICE_RNG, dev) < 0) { - goto error; + return NULL; } =20 virBufferAsprintf(&buf, ",rng=3Dobj%s,id=3D%s", @@ -5993,17 +5879,14 @@ qemuBuildRNGDevStr(const virDomainDef *def, } =20 if (qemuBuildVirtioOptionsStr(&buf, dev->virtio, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) - goto error; + return NULL; if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -6194,12 +6077,9 @@ qemuBuildSmbiosBaseBoardStr(virSysinfoBaseBoardDefPt= r def) } =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -6258,12 +6138,9 @@ qemuBuildSmbiosChassisStr(virSysinfoChassisDefPtr de= f) } =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -6437,7 +6314,7 @@ qemuBuildClockArgStr(virDomainClockDefPtr def) * startup). */ if (virTimeLocalOffsetFromUTC(&localOffset) < 0) - goto error; + return NULL; def->data.variable.adjustment +=3D localOffset; def->data.variable.basis =3D VIR_DOMAIN_CLOCK_BASIS_UTC; } @@ -6466,7 +6343,7 @@ qemuBuildClockArgStr(virDomainClockDefPtr def) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported clock offset '%s'"), virDomainClockOffsetTypeToString(def->offset)); - goto error; + return NULL; } =20 /* Look for an 'rtc' timer element, and add in appropriate @@ -6480,7 +6357,7 @@ qemuBuildClockArgStr(virDomainClockDefPtr def) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported rtc timer track '%s'"), virDomainTimerTrackTypeToString(def->timers= [i]->track)); - goto error; + return NULL; case VIR_DOMAIN_TIMER_TRACK_GUEST: virBufferAddLit(&buf, ",clock=3Dvm"); break; @@ -6504,19 +6381,16 @@ qemuBuildClockArgStr(virDomainClockDefPtr def) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported rtc timer tickpolicy '%s'"), virDomainTimerTickpolicyTypeToString(def->t= imers[i]->tickpolicy)); - goto error; + return NULL; } break; /* no need to check other timers - there is only one rt= c */ } } =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -6704,7 +6578,7 @@ qemuBuildBootCommandLine(virCommandPtr cmd, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("reboot timeout is not supported " "by this QEMU binary")); - goto error; + return -1; } =20 virBufferAsprintf(&boot_buf, @@ -6717,7 +6591,7 @@ qemuBuildBootCommandLine(virCommandPtr cmd, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("splash timeout is not supported " "by this QEMU binary")); - goto error; + return -1; } =20 virBufferAsprintf(&boot_buf, "splash-time=3D%u,", def->os.bm_timeo= ut); @@ -6729,7 +6603,7 @@ qemuBuildBootCommandLine(virCommandPtr cmd, virBufferTrim(&boot_buf, ",", -1); =20 if (virBufferCheckError(&boot_buf) < 0) - goto error; + return -1; =20 boot_opts_str =3D virBufferContentAndReset(&boot_buf); if (boot_opts_str) { @@ -6755,9 +6629,6 @@ qemuBuildBootCommandLine(virCommandPtr cmd, } =20 return 0; - - error: - return -1; } =20 =20 @@ -6898,13 +6769,12 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver, virBufferPtr buf, virQEMUCapsPtr qemuCaps) { - int ret =3D -1; size_t i; VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; virCPUDefPtr cpu =3D def->cpu; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; + return -1; =20 switch ((virCPUMode) cpu->mode) { case VIR_CPU_MODE_HOST_PASSTHROUGH: @@ -6917,7 +6787,7 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver, _("QEMU binary does not support CPU " "host-passthrough for armv7l on " "aarch64 host")); - goto cleanup; + return -1; } virBufferAddLit(buf, ",aarch64=3Doff"); } @@ -6935,7 +6805,7 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver, virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected host-model CPU for %s architectur= e"), virArchToString(def->os.arch)); - goto cleanup; + return -1; } break; =20 @@ -6952,7 +6822,7 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver, virReportError(VIR_ERR_INTERNAL_ERROR, _("CPU features not supported by hypervisor for %s " "architecture"), virArchToString(def->os.arch)); - goto cleanup; + return -1; } =20 if (cpu->vendor_id) @@ -6976,9 +6846,7 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver, } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int @@ -6990,7 +6858,6 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, virArch hostarch =3D virArchFromHost(); VIR_AUTOFREE(char *) cpu =3D NULL; VIR_AUTOFREE(char *) cpu_flags =3D NULL; - int ret =3D -1; VIR_AUTOCLEAN(virBuffer) cpu_buf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t i; @@ -6998,7 +6865,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, if (def->cpu && (def->cpu->mode !=3D VIR_CPU_MODE_CUSTOM || def->cpu->model)) { if (qemuBuildCpuModelArgStr(driver, def, &cpu_buf, qemuCaps) < 0) - goto cleanup; + return -1; } else { /* * Need to force a 32-bit guest CPU type if @@ -7164,9 +7031,9 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, } =20 if (virBufferCheckError(&cpu_buf) < 0) - goto cleanup; + return -1; if (virBufferCheckError(&buf) < 0) - goto cleanup; + return -1; =20 cpu =3D virBufferContentAndReset(&cpu_buf); cpu_flags =3D virBufferContentAndReset(&buf); @@ -7186,11 +7053,11 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, _("CPU flags requested but can't determine " "default CPU for arch %s"), virArchToString(def->os.arch)); - goto cleanup; + return -1; } =20 if (VIR_STRDUP(cpu, default_model) < 0) - goto cleanup; + return -1; } =20 if (cpu) { @@ -7198,10 +7065,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, virCommandAddArgFormat(cmd, "%s%s", cpu, NULLSTR_EMPTY(cpu_flags)); } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -7304,7 +7168,6 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virCPUDefPtr cpu =3D def->cpu; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t i; - int ret =3D -1; =20 /* This should *never* be NULL, since we always provide * a machine in the capabilities data for QEMU. So this @@ -7360,7 +7223,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("vmport is not available " "with this QEMU binary")); - goto cleanup; + return -1; } =20 virBufferAsprintf(&buf, ",vmport=3D%s", @@ -7383,7 +7246,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("disable shared memory is not available " "with this QEMU binary")); - goto cleanup; + return -1; } =20 virBufferAddLit(&buf, ",mem-merge=3Doff"); @@ -7391,7 +7254,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, =20 if (def->keywrap && !qemuAppendKeyWrapMachineParms(&buf, qemuCaps, def->keywrap)) - goto cleanup; + return -1; =20 if (def->features[VIR_DOMAIN_FEATURE_GIC] =3D=3D VIR_TRISTATE_SWITCH_O= N) { bool hasGICVersionOption =3D virQEMUCapsGet(qemuCaps, @@ -7416,7 +7279,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("gic-version option is not available " "with this QEMU binary")); - goto cleanup; + return -1; } =20 virBufferAsprintf(&buf, ",gic-version=3D%s", @@ -7457,7 +7320,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVDIMM)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("nvdimm isn't supported by this QEMU bina= ry")); - goto cleanup; + return -1; } virBufferAddLit(&buf, ",nvdimm=3Don"); break; @@ -7469,7 +7332,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("I/O APIC tuning is not supported by this " "QEMU binary")); - goto cleanup; + return -1; } switch ((virDomainIOAPIC) def->features[VIR_DOMAIN_FEATURE_IOAPIC]= ) { case VIR_DOMAIN_IOAPIC_QEMU: @@ -7477,7 +7340,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("split I/O APIC is not supported by this " "QEMU binary")); - goto cleanup; + return -1; } virBufferAddLit(&buf, ",kernel_irqchip=3Dsplit"); break; @@ -7499,14 +7362,14 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("HTP resizing is not supported by this " "QEMU binary")); - goto cleanup; + return -1; } =20 str =3D virDomainHPTResizingTypeToString(def->hpt_resizing); if (!str) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Invalid setting for HPT resizing")); - goto cleanup; + return -1; } =20 virBufferAsprintf(&buf, ",resize-hpt=3D%s", str); @@ -7517,7 +7380,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Configuring the page size for HPT guests= " "is not supported by this QEMU binary")); - goto cleanup; + return -1; } =20 virBufferAsprintf(&buf, ",cap-hpt-max-page-size=3D%lluk", @@ -7532,14 +7395,14 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("HTM configuration is not supported by this " "QEMU binary")); - goto cleanup; + return -1; } =20 str =3D virTristateSwitchTypeToString(def->features[VIR_DOMAIN_FEA= TURE_HTM]); if (!str) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Invalid setting for HTM state")); - goto cleanup; + return -1; } =20 virBufferAsprintf(&buf, ",cap-htm=3D%s", str); @@ -7552,14 +7415,14 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Nested HV configuration is not supported by " "this QEMU binary")); - goto cleanup; + return -1; } =20 str =3D virTristateSwitchTypeToString(def->features[VIR_DOMAIN_FEA= TURE_NESTED_HV]); if (!str) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Invalid setting for nested HV state")); - goto cleanup; + return -1; } =20 virBufferAsprintf(&buf, ",cap-nested-hv=3D%s", str); @@ -7580,9 +7443,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, =20 virCommandAddArgBuffer(cmd, &buf); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -7956,7 +7817,6 @@ qemuBuildGraphicsSDLCommandLine(virQEMUDriverConfigPt= r cfg ATTRIBUTE_UNUSED, virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED, virDomainGraphicsDefPtr graphics) { - int ret =3D -1; VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; =20 if (graphics->data.sdl.xauth) @@ -7981,7 +7841,7 @@ qemuBuildGraphicsSDLCommandLine(virQEMUDriverConfigPt= r cfg ATTRIBUTE_UNUSED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("OpenGL for SDL is not supported with this QE= MU " "binary")); - goto cleanup; + return -1; } =20 virBufferAsprintf(&opt, ",gl=3D%s", @@ -7990,13 +7850,11 @@ qemuBuildGraphicsSDLCommandLine(virQEMUDriverConfig= Ptr cfg ATTRIBUTE_UNUSED, } =20 if (virBufferCheckError(&opt) < 0) - goto cleanup; + return -1; =20 virCommandAddArgBuffer(cmd, &opt); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -8013,13 +7871,13 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig= Ptr cfg, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("vnc graphics are not supported with this QEMU")); - goto error; + return -1; } =20 if (!(glisten =3D virDomainGraphicsGetListen(graphics, 0))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing listen element")); - goto error; + return -1; } =20 switch (glisten->type) { @@ -8038,7 +7896,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPt= r cfg, graphics->data.vnc.port > 65535)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("vnc port must be in range [5900,65535]")); - goto error; + return -1; } =20 if (glisten->address) { @@ -8080,7 +7938,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPt= r cfg, if (gfxPriv->secinfo) { if (qemuBuildObjectSecretCommandLine(cmd, gfxPriv->secinfo) < 0) - goto error; + return -1; secretAlias =3D gfxPriv->secinfo->s.aes.alias; } =20 @@ -8091,7 +7949,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPt= r cfg, secretAlias, gfxPriv->tlsAlias, qemuCaps) < 0) - goto error; + return -1; =20 virBufferAsprintf(&opt, ",tls-creds=3D%s", gfxPriv->tlsAlias); } else { @@ -8130,9 +7988,6 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPt= r cfg, virCommandAddEnvString(cmd, "QEMU_AUDIO_DRV=3Dnone"); =20 return 0; - - error: - return -1; } =20 =20 @@ -8153,13 +8008,13 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConf= igPtr cfg, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("spice graphics are not supported with this QEMU"= )); - goto error; + return -1; } =20 if (!(glisten =3D virDomainGraphicsGetListen(graphics, 0))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing listen element")); - goto error; + return -1; } =20 switch (glisten->type) { @@ -8168,7 +8023,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unix socket for spice graphics are not suppo= rted " "with this QEMU")); - goto error; + return -1; } =20 virBufferAddLit(&opt, "unix,addr=3D"); @@ -8189,7 +8044,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("spice TLS port set in XML configuration,= " "but TLS is disabled in qemu.conf")); - goto error; + return -1; } virBufferAsprintf(&opt, "tls-port=3D%u,", tlsPort); hasSecure =3D true; @@ -8236,7 +8091,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, default: virReportEnumRangeError(virDomainGraphicsSpiceMouseMode, graphics->data.spice.mousemode); - goto error; + return -1; } } =20 @@ -8260,7 +8115,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, _("spice defaultMode secure requested in XML " "configuration, but TLS connection is not " "available")); - goto error; + return -1; } virBufferAddLit(&opt, "tls-channel=3Ddefault,"); break; @@ -8270,7 +8125,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, _("spice defaultMode insecure requested in XML " "configuration, but plaintext connection is n= ot " "available")); - goto error; + return -1; } virBufferAddLit(&opt, "plaintext-channel=3Ddefault,"); break; @@ -8288,7 +8143,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, _("spice secure channels set in XML " "configuration, but TLS connection is not= " "available")); - goto error; + return -1; } virBufferAsprintf(&opt, "tls-channel=3D%s,", virDomainGraphicsSpiceChannelNameTypeToStrin= g(i)); @@ -8300,7 +8155,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, _("spice insecure channels set in XML " "configuration, but plaintext connection " "is not available")); - goto error; + return -1; } virBufferAsprintf(&opt, "plaintext-channel=3D%s,", virDomainGraphicsSpiceChannelNameTypeToStrin= g(i)); @@ -8333,7 +8188,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE_FILE_XFER_DISABLE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU can't disable file transfers throug= h spice")); - goto error; + return -1; } else { virBufferAddLit(&opt, "disable-agent-file-xfer,"); } @@ -8343,7 +8198,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE_GL)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support spice OpenGL")); - goto error; + return -1; } =20 /* spice.gl is a TristateBool, but qemu expects on/off: use @@ -8355,7 +8210,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE_RENDERNODE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support spice OpenGL r= endernode")); - goto error; + return -1; } =20 virBufferAddLit(&opt, "rendernode=3D"); @@ -8381,9 +8236,6 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, virCommandAddEnvString(cmd, "QEMU_AUDIO_DRV=3Dspice"); =20 return 0; - - error: - return -1; } =20 =20 @@ -8393,7 +8245,6 @@ qemuBuildGraphicsEGLHeadlessCommandLine(virQEMUDriver= ConfigPtr cfg ATTRIBUTE_UNU virQEMUCapsPtr qemuCaps, virDomainGraphicsDefPtr graphics) { - int ret =3D -1; VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; =20 virBufferAddLit(&opt, "egl-headless"); @@ -8403,7 +8254,7 @@ qemuBuildGraphicsEGLHeadlessCommandLine(virQEMUDriver= ConfigPtr cfg ATTRIBUTE_UNU virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support OpenGL rendernode " "with egl-headless graphics type")); - goto cleanup; + return -1; } =20 virBufferAddLit(&opt, ",rendernode=3D"); @@ -8412,14 +8263,12 @@ qemuBuildGraphicsEGLHeadlessCommandLine(virQEMUDriv= erConfigPtr cfg ATTRIBUTE_UNU } =20 if (virBufferCheckError(&opt) < 0) - goto cleanup; + return -1; =20 virCommandAddArg(cmd, "-display"); virCommandAddArgBuffer(cmd, &opt); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -8486,7 +8335,6 @@ qemuInterfaceVhostuserConnect(virQEMUDriverPtr driver, char **chardev) { VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - int ret =3D -1; =20 switch ((virDomainChrType)net->data.vhostuser->type) { case VIR_DOMAIN_CHR_TYPE_UNIX: @@ -8494,7 +8342,7 @@ qemuInterfaceVhostuserConnect(virQEMUDriverPtr driver, cmd, cfg, def, net->data.vhostuser, net->info.alias, qemuCaps,= 0))) - goto cleanup; + return -1; break; =20 case VIR_DOMAIN_CHR_TYPE_NULL: @@ -8513,12 +8361,10 @@ qemuInterfaceVhostuserConnect(virQEMUDriverPtr driv= er, virReportError(VIR_ERR_INTERNAL_ERROR, _("vhost-user type '%s' not supported"), virDomainChrTypeToString(net->data.vhostuser->type)= ); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int @@ -9104,15 +8950,12 @@ qemuBuildShmemDevLegacyStr(virDomainDefPtr def, } =20 if (qemuBuildDeviceAddressStr(&buf, def, &shmem->info, qemuCaps) < 0) - goto error; + return NULL; =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 char * @@ -9169,7 +9012,7 @@ qemuBuildShmemBackendMemProps(virDomainShmemDefPtr sh= mem) return NULL; =20 if (virAsprintf(&mem_alias, "shmmem-%s", shmem->info.alias) < 0) - goto cleanup; + return NULL; =20 qemuMonitorCreateObjectProps(&ret, "memory-backend-file", mem_alias, "s:mem-path", mem_path, @@ -9177,7 +9020,6 @@ qemuBuildShmemBackendMemProps(virDomainShmemDefPtr sh= mem) "b:share", true, NULL); =20 - cleanup: return ret; } =20 @@ -9625,14 +9467,14 @@ qemuBuildRedirdevDevStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Redirection bus %s is not supported by QEMU"), virDomainRedirdevBusTypeToString(dev->bus)); - goto error; + return NULL; } =20 if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_REDIR)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("USB redirection is not supported " "by this version of QEMU")); - goto error; + return NULL; } =20 virBufferAsprintf(&buf, "usb-redir,chardev=3Dchar%s,id=3D%s", @@ -9643,7 +9485,7 @@ qemuBuildRedirdevDevStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("USB redirection filter is not " "supported by this version of QEMU")); - goto error; + return NULL; } =20 virBufferAddLit(&buf, ",filter=3D"); @@ -9680,15 +9522,12 @@ qemuBuildRedirdevDevStr(const virDomainDef *def, virBufferAsprintf(&buf, ",bootindex=3D%u", dev->info.bootIndex); =20 if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) - goto error; + return NULL; =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -9811,7 +9650,7 @@ qemuBuildTPMDevStr(const virDomainDef *def, case VIR_DOMAIN_TPM_MODEL_LAST: default: virReportEnumRangeError(virDomainTPMModel, tpm->model); - goto error; + return NULL; } =20 if (!virQEMUCapsGet(qemuCaps, flag)) { @@ -9819,19 +9658,16 @@ qemuBuildTPMDevStr(const virDomainDef *def, _("The QEMU executable %s does not support TPM " "model %s"), def->emulator, model); - goto error; + return NULL; } =20 virBufferAsprintf(&buf, "%s,tpmdev=3Dtpm-%s,id=3D%s", model, tpm->info.alias, tpm->info.alias); =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -9884,17 +9720,17 @@ qemuBuildTPMBackendStr(const virDomainDef *def, case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: tpmdev =3D tpm->data.passthrough.source.data.file.path; if (!(cancel_path =3D virTPMCreateCancelPath(tpmdev))) - goto error; + return NULL; =20 if (qemuBuildTPMOpenBackendFDs(tpmdev, cancel_path, tpmfd, cancelf= d) < 0) - goto error; + return NULL; =20 virCommandPassFD(cmd, *tpmfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); virCommandPassFD(cmd, *cancelfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); =20 if (!(devset =3D qemuVirCommandGetDevSet(cmd, *tpmfd)) || !(cancelset =3D qemuVirCommandGetDevSet(cmd, *cancelfd))) - goto error; + return NULL; =20 virBufferAddLit(&buf, ",path=3D"); virQEMUBuildBufferEscapeComma(&buf, devset); @@ -9908,20 +9744,17 @@ qemuBuildTPMBackendStr(const virDomainDef *def, =20 if (virAsprintf(chardev, "socket,id=3Dchrtpm,path=3D%s", tpm->data.emulator.source.data.nix.path) < 0) - goto error; + return NULL; =20 break; case VIR_DOMAIN_TPM_TYPE_LAST: - goto error; + return NULL; } =20 if (virBufferCheckError(&buf) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 @@ -9984,7 +9817,6 @@ qemuBuildSEVCommandLine(virDomainObjPtr vm, virComman= dPtr cmd, VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; qemuDomainObjPrivatePtr priv =3D vm->privateData; char *path =3D NULL; - int ret =3D -1; =20 if (!sev) return 0; @@ -9998,23 +9830,21 @@ qemuBuildSEVCommandLine(virDomainObjPtr vm, virComm= andPtr cmd, =20 if (sev->dh_cert) { if (virAsprintf(&path, "%s/dh_cert.base64", priv->libDir) < 0) - goto cleanup; + return -1; virBufferAsprintf(&buf, ",dh-cert-file=3D%s", path); VIR_FREE(path); } =20 if (sev->session) { if (virAsprintf(&path, "%s/session.base64", priv->libDir) < 0) - goto cleanup; + return -1; virBufferAsprintf(&buf, ",session-file=3D%s", path); VIR_FREE(path); } =20 virCommandAddArg(cmd, "-object"); virCommandAddArgBuffer(cmd, &buf); - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int @@ -10167,15 +9997,12 @@ virJSONValuePtr qemuBuildPRManagedManagerInfoProps(qemuDomainObjPrivatePtr priv) { VIR_AUTOFREE(char *) path =3D NULL; - virJSONValuePtr ret =3D NULL; =20 if (!(path =3D qemuDomainGetManagedPRSocketPath(priv))) return NULL; =20 - ret =3D qemuBuildPRManagerInfoPropsInternal(qemuDomainGetManagedPRAlia= s(), - path); - - return ret; + return qemuBuildPRManagerInfoPropsInternal(qemuDomainGetManagedPRAlias= (), + path); } =20 =20 @@ -10199,7 +10026,6 @@ qemuBuildManagedPRCommandLine(virCommandPtr cmd, { VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOPTR(virJSONValue) props =3D NULL; - int ret =3D -1; =20 if (!virDomainDefHasManagedPR(def)) return 0; @@ -10208,14 +10034,12 @@ qemuBuildManagedPRCommandLine(virCommandPtr cmd, return -1; =20 if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0) - goto cleanup; + return -1; =20 virCommandAddArg(cmd, "-object"); virCommandAddArgBuffer(cmd, &buf); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -10345,27 +10169,22 @@ qemuBuildVsockDevStr(virDomainDefPtr def, { qemuDomainVsockPrivatePtr priv =3D (qemuDomainVsockPrivatePtr)vsock->p= rivateData; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - char *ret =3D NULL; - =20 if (qemuBuildVirtioDevStr(&buf, "vhost-vsock", qemuCaps, VIR_DOMAIN_DEVICE_VSOCK, vsock) < 0) { - goto cleanup; + return NULL; } =20 virBufferAsprintf(&buf, ",id=3D%s", vsock->info.alias); virBufferAsprintf(&buf, ",guest-cid=3D%u", vsock->guest_cid); virBufferAsprintf(&buf, ",vhostfd=3D%s%u", fdprefix, priv->vhostfd); if (qemuBuildDeviceAddressStr(&buf, def, &vsock->info, qemuCaps) < 0) - goto cleanup; + return NULL; =20 if (virBufferCheckError(&buf) < 0) - goto cleanup; - - ret =3D virBufferContentAndReset(&buf); + return NULL; =20 - cleanup: - return ret; + return virBufferContentAndReset(&buf); } =20 =20 @@ -10377,22 +10196,19 @@ qemuBuildVsockCommandLine(virCommandPtr cmd, { qemuDomainVsockPrivatePtr priv =3D (qemuDomainVsockPrivatePtr)vsock->p= rivateData; VIR_AUTOFREE(char *) devstr =3D NULL; - int ret =3D -1; =20 if (!(devstr =3D qemuBuildVsockDevStr(def, vsock, qemuCaps, ""))) - goto cleanup; + return -1; =20 virCommandPassFD(cmd, priv->vhostfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); priv->vhostfd =3D -1; =20 if (qemuCommandAddExtDevice(cmd, &vsock->info) < 0) - goto cleanup; + return -1; =20 virCommandAddArgList(cmd, "-device", devstr, NULL); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -10707,7 +10523,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("'%s' is not supported in this QEMU binary"), virDomainChrSerialTargetModelTypeToString(seria= l->targetModel)); - goto error; + return -1; } break; =20 @@ -10721,7 +10537,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, * branch and we will not have ended up here. */ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid target model for serial device")); - goto error; + return -1; } =20 virBufferAsprintf(&buf, "%s,chardev=3Dchar%s,id=3D%s", @@ -10729,16 +10545,13 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, serial->info.alias, serial->info.alias); =20 if (qemuBuildDeviceAddressStr(&buf, def, &serial->info, qemuCaps) < 0) - goto error; + return -1; =20 if (virBufferCheckError(&buf) < 0) - goto error; + return -1; =20 *deviceStr =3D virBufferContentAndReset(&buf); return 0; - - error: - return -1; } =20 static int @@ -10771,12 +10584,12 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, if (virAsprintf(deviceStr, "user,guestfwd=3Dtcp:%s:%i-chardev:char%s,id=3D%s", addr, port, chr->info.alias, chr->info.alias) < 0) - goto cleanup; + return -1; break; =20 case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: if (!(*deviceStr =3D qemuBuildVirtioSerialPortDevStr(def, chr))) - goto cleanup; + return -1; break; =20 case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN: @@ -10785,9 +10598,7 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, return ret; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int @@ -10795,18 +10606,16 @@ qemuBuildConsoleChrDeviceStr(char **deviceStr, const virDomainDef *def, virDomainChrDefPtr chr) { - int ret =3D -1; - switch ((virDomainChrConsoleTargetType)chr->targetType) { case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLPLM: if (!(*deviceStr =3D qemuBuildSclpDevStr(chr))) - goto cleanup; + return -1; break; =20 case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO: if (!(*deviceStr =3D qemuBuildVirtioSerialPortDevStr(def, chr))) - goto cleanup; + return -1; break; =20 case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL: @@ -10821,12 +10630,10 @@ qemuBuildConsoleChrDeviceStr(char **deviceStr, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported console target type %s"), NULLSTR(virDomainChrConsoleTargetTypeToString(chr->= targetType))); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 int --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305993; cv=none; d=zoho.com; s=zohoarc; b=damt6cF+T24FFzCwVKft3bakRSxE0c09jHEBTqTXtmaWSEZsr4cxVMyZAmj1+ABZOhybNbllJU4tI50X74UrfEnvs9wV7Zy9tntCKSFyzR+MQ+s8D9c/r80DaWVCn2Oo24NwRazqiedFty3CF00lI9C0nDBn3Hv4cBvkkGcMXnw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305993; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Gu8mPwRXB9kC4JOa2Xv6shnEDou6ZgGbUJNqUrSpP4A=; b=BvveHo1D3O+WzbUhlkv+B8nlPAgeWwF44gva5ukvTqT5YyigOtMrWOJ67rX62zQ0O3NFhCAO/cj5msQ0/d9bH1lYXyOv8pWuouMfNeRR3pNTJSme5gTC/711ET1M+Sr5bpJnVT6TKthxHEOf0dbj4uEk2/EmFSUz5AmjsihqXKM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566305993199273.1218393616955; Tue, 20 Aug 2019 05:59:53 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 091D6A35FF5; Tue, 20 Aug 2019 12:59:52 +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 DD82C182C8; Tue, 20 Aug 2019 12:59:51 +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 A5CDF4EE6A; Tue, 20 Aug 2019 12:59:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxnCP023297 for ; Tue, 20 Aug 2019 08:59:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 07AA487A1; Tue, 20 Aug 2019 12:59:49 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85D2D1E4 for ; Tue, 20 Aug 2019 12:59:48 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:17 +0200 Message-Id: <39304fc9cd50c09321ba4bc605e4cdb8ee2f0e2d.1566305923.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 18/19] qemuBuildCommandLine: use VIR_AUTO* X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Tue, 20 Aug 2019 12:59:52 +0000 (UTC) Prepare this big function for a cleanup. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0e9bd77f62..82e2a451c2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10231,8 +10231,8 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, { size_t i; char uuid[VIR_UUID_STRING_BUFLEN]; - virCommandPtr cmd =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOPTR(virCommand) cmd =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); unsigned int bootHostdevNet =3D 0; qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDefPtr def =3D vm->def; @@ -10487,12 +10487,9 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, cfg->logTimestamp) virCommandAddArgList(cmd, "-msg", "timestamp=3Don", NULL); =20 - virObjectUnref(cfg); - return cmd; + VIR_RETURN_PTR(cmd); =20 error: - virObjectUnref(cfg); - virCommandFree(cmd); return NULL; } =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 13:09:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566306005; cv=none; d=zoho.com; s=zohoarc; b=fhGR5iY3OpusUkblLnwynII6bgsKedNFHJhGKNvL8pluAEBX9x3RKUY+HBtSwPiWn0qw9GCFjAKYWRTki/ck7KYpwAUtF/NW7qm71Il0uVMXog4P56norCuPsO2m8VuYPRFfvKp9efOdukHEQj/9YqIh9Vzn3wggAfMChU0snyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566306005; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=pbh6wBqyo7Tfrm/OFRQ/rMQDaXJYljG+TT5hcbuPxBM=; b=BOrSQvoU8LbX+W/ntXlAVcEad0IWtBGH+nDitCFQqK/afq+tuPNlXKuXKK0qsaREdIsjtNEQGlB5xPIwHjJBAeQ15vLMe+F0/FvJxchET+rrjTdoojFP1J/6/vuC+ESdU5eyimlqiz72CeDvB34mMmsoHftxIvQIwj5ya82Z3go= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566306005617732.849197842746; Tue, 20 Aug 2019 06:00:05 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 289CF3060286; Tue, 20 Aug 2019 13:00:03 +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 DAEE48CBFE; Tue, 20 Aug 2019 13:00:02 +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 C0C374EE73; Tue, 20 Aug 2019 13:00:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KCxqfq023373 for ; Tue, 20 Aug 2019 08:59:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 849021E4; Tue, 20 Aug 2019 12:59:52 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E20587A1 for ; Tue, 20 Aug 2019 12:59:49 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:18 +0200 Message-Id: <9e2ae35c12f589d27bdc985c4efd60f9d931ef02.1566305923.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 19/19] qemuBuildCommandLine: remove unnecessary error label X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 20 Aug 2019 13:00:04 +0000 (UTC) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 101 +++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 52 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 82e2a451c2..8cc8f82aab 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10245,7 +10245,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, qemuCaps, migrateURI, snapshot, vmop); =20 if (qemuBuildCommandLineValidate(driver, def) < 0) - goto error; + return NULL; =20 cmd =3D virCommandNew(def->emulator); =20 @@ -10269,57 +10269,57 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, } =20 if (qemuBuildNameCommandLine(cmd, cfg, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (!standalone) virCommandAddArg(cmd, "-S"); /* freeze CPU */ =20 if (qemuBuildMasterKeyCommandLine(cmd, priv) < 0) - goto error; + return NULL; =20 if (qemuBuildManagedPRCommandLine(cmd, def, priv) < 0) - goto error; + return NULL; =20 if (enableFips) virCommandAddArg(cmd, "-enable-fips"); =20 if (qemuBuildMachineCommandLine(cmd, cfg, def, qemuCaps) < 0) - goto error; + return NULL; =20 qemuBuildTSEGCommandLine(cmd, def); =20 if (qemuBuildCpuCommandLine(cmd, driver, def, qemuCaps) < 0) - goto error; + return NULL; =20 qemuBuildDomainLoaderCommandLine(cmd, def); =20 if (!migrateURI && !snapshot && qemuDomainAlignMemorySizes(def) < 0) - goto error; + return NULL; =20 if (qemuBuildMemCommandLine(cmd, cfg, def, qemuCaps, priv) < 0) - goto error; + return NULL; =20 if (qemuBuildSmpCommandLine(cmd, def) < 0) - goto error; + return NULL; =20 if (qemuBuildIOThreadCommandLine(cmd, def) < 0) - goto error; + return NULL; =20 if (virDomainNumaGetNodeCount(def->numa) && qemuBuildNumaArgStr(cfg, def, cmd, priv) < 0) - goto error; + return NULL; =20 if (qemuBuildMemoryDeviceCommandLine(cmd, cfg, def, priv) < 0) - goto error; + return NULL; =20 virUUIDFormat(def->uuid, uuid); virCommandAddArgList(cmd, "-uuid", uuid, NULL); =20 if (qemuBuildSmbiosCommandLine(cmd, driver, def) < 0) - goto error; + return NULL; =20 if (qemuBuildVMGenIDCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 /* * NB, -nographic *MUST* come before any serial, or monitor @@ -10343,110 +10343,110 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, virCommandAddArg(cmd, "-nodefaults"); =20 if (qemuBuildSgaCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildMonitorCommandLine(logManager, secManager, cmd, cfg, def,= priv) < 0) - goto error; + return NULL; =20 if (qemuBuildClockCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildPMCommandLine(cmd, def, priv) < 0) - goto error; + return NULL; =20 if (qemuBuildBootCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildIOMMUCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildGlobalControllerCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildControllersCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildHubCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildControllersByTypeCommandLine(cmd, def, qemuCaps, VIR_DOMAIN_CONTROLLER_TYPE_C= CID) < 0) - goto error; + return NULL; =20 if (qemuBuildDisksCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildFilesystemCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildNetCommandLine(driver, logManager, secManager, cmd, def, qemuCaps, vmop, standalone, nnicindexes, nicindexes, &bootHostdevNet) = < 0) - goto error; + return NULL; =20 if (qemuBuildSmartcardCommandLine(logManager, secManager, cmd, cfg, de= f, qemuCaps, chardevStdioLogd) < 0) - goto error; + return NULL; =20 if (qemuBuildSerialCommandLine(logManager, secManager, cmd, cfg, def, = qemuCaps, chardevStdioLogd) < 0) - goto error; + return NULL; =20 if (qemuBuildParallelsCommandLine(logManager, secManager, cmd, cfg, de= f, qemuCaps, chardevStdioLogd) < 0) - goto error; + return NULL; =20 if (qemuBuildChannelsCommandLine(logManager, secManager, cmd, cfg, def= , qemuCaps, chardevStdioLogd) < 0) - goto error; + return NULL; =20 if (qemuBuildConsoleCommandLine(logManager, secManager, cmd, cfg, def,= qemuCaps, chardevStdioLogd) < 0) - goto error; + return NULL; =20 if (qemuBuildTPMCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildInputCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildGraphicsCommandLine(cfg, cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildVideoCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildSoundCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildWatchdogCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildRedirdevCommandLine(logManager, secManager, cmd, cfg, def= , qemuCaps, chardevStdioLogd) < 0) - goto error; + return NULL; =20 if (qemuBuildHostdevCommandLine(cmd, def, qemuCaps, &bootHostdevNet) <= 0) - goto error; + return NULL; =20 if (migrateURI) virCommandAddArgList(cmd, "-incoming", migrateURI, NULL); =20 if (qemuBuildMemballoonCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildRNGCommandLine(logManager, secManager, cmd, cfg, def, qem= uCaps, chardevStdioLogd) < 0) - goto error; + return NULL; =20 if (qemuBuildNVRAMCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildVMCoreInfoCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildSEVCommandLine(vm, cmd, def->sev) < 0) - goto error; + return NULL; =20 if (snapshot) virCommandAddArgList(cmd, "-loadvm", snapshot->def->name, NULL); @@ -10463,21 +10463,21 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, } =20 if (qemuBuildSeccompSandboxCommandLine(cmd, cfg, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildPanicCommandLine(cmd, def, qemuCaps) < 0) - goto error; + return NULL; =20 for (i =3D 0; i < def->nshmems; i++) { if (qemuBuildShmemCommandLine(logManager, secManager, cmd, cfg, def, def->shmems[i], qemuCaps, chardevStdioLogd)) - goto error; + return NULL; } =20 if (def->vsock && qemuBuildVsockCommandLine(cmd, def, def->vsock, qemuCaps) < 0) - goto error; + return NULL; =20 /* In some situations, eg. VFIO passthrough, QEMU might need to lock a * significant amount of memory, so we need to set the limit according= ly */ @@ -10488,9 +10488,6 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, virCommandAddArgList(cmd, "-msg", "timestamp=3Don", NULL); =20 VIR_RETURN_PTR(cmd); - - error: - return NULL; } =20 =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list