From nobody Fri Apr 19 14:20:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) client-ip=63.128.21.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 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=1595979821; cv=none; d=zohomail.com; s=zohoarc; b=QEGc5N8T3fh3jlNOUdxm3eG+Lw/cic+09RELfgcDwyPVPo1zX8iQefQ61KeT8lbhMOCwoIv8HyGKTsVDmaSTKFzyRkOllymGaLEWmf2Zd4KZN8wkbtjg7C0AkxpVs8yqK7CSX/XyvsfdhJj2jewBPENmnC5eiyVCdygmnZuGD20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595979821; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KcTzRgRpAHOEZm5PTGuwnouO/cF0Tirq5bdbVYxsQGw=; b=J4bqdU/H+BvJ4wTq+V3Le8Lp78KS/8S+CdwrN3zdKl1ogSfJFvgYiQWQodk4Y9rObmCDsHSHJJfxWv8SMd13FTLZfAdrCrq1SQjO4FKhl/7gCho0pEb9ukHbN2xS/ApagMh+uAJXhDwZR57LldljseW3czEqFnZ4k2n94q7xZvs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [63.128.21.74]) by mx.zohomail.com with SMTPS id 1595979820995389.89998990791264; Tue, 28 Jul 2020 16:43:40 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-200-f7ruYO4fMpW0-otK4Ub1XA-1; Tue, 28 Jul 2020 19:43:36 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 077AD19067E0; Tue, 28 Jul 2020 23:43:31 +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 D97EE712F9; Tue, 28 Jul 2020 23:43:30 +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 859CA1809554; Tue, 28 Jul 2020 23:43:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06SNhRCh004272 for ; Tue, 28 Jul 2020 19:43:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id AC4191001B2C; Tue, 28 Jul 2020 23:43:27 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2C4C10013C4 for ; Tue, 28 Jul 2020 23:43:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595979819; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=KcTzRgRpAHOEZm5PTGuwnouO/cF0Tirq5bdbVYxsQGw=; b=EwP1v7TQRNTFM8olmbk0OJmh+t+JoAJnMY/ysxrsDQao7+ie1JHY/DR/yk+QCkHTdTFNy/ 4I/rQ7PDoIRGXnpb2FGELQE4WiLr7if/L0dIw1biUNHLhBa3tKgD4AKueEZG1U6j9oeBVQ e9v006s2cH/dTgQ1arEW+ukX4e20T7M= X-MC-Unique: f7ruYO4fMpW0-otK4Ub1XA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/6] tests: qemu: reduce scope of some variables Date: Wed, 29 Jul 2020 01:43:16 +0200 Message-Id: <87aec4d6169438889588719b95d9dbd842d46611.1595979782.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Reduce the scope of some variables and mark them as g_autofree. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- tests/qemumonitortestutils.c | 6 ++---- tests/testutilsqemu.c | 4 +--- tests/utiltest.c | 15 ++------------- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 180ac15a15..c7396e4361 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -787,7 +787,6 @@ qemuMonitorTestProcessCommandWithArgs(qemuMonitorTestPt= r test, virJSONValuePtr val =3D NULL; virJSONValuePtr args; virJSONValuePtr argobj; - char *argstr =3D NULL; const char *cmdname; size_t i; int ret =3D -1; @@ -815,6 +814,8 @@ qemuMonitorTestProcessCommandWithArgs(qemuMonitorTestPt= r test, /* validate the args */ for (i =3D 0; i < data->nargs; i++) { qemuMonitorTestCommandArgsPtr arg =3D &data->args[i]; + g_autofree char *argstr =3D NULL; + if (!(argobj =3D virJSONValueObjectGet(args, arg->argname))) { qemuMonitorTestError("Missing argument '%s' for command '%s'", arg->argname, @@ -835,15 +836,12 @@ qemuMonitorTestProcessCommandWithArgs(qemuMonitorTest= Ptr test, arg->argval, argstr); goto cleanup; } - - VIR_FREE(argstr); } =20 /* arguments checked out, return the response */ ret =3D qemuMonitorTestAddResponse(test, data->response); =20 cleanup: - VIR_FREE(argstr); virJSONValueFree(val); return ret; } diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index e3b1e2813b..855e51460b 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -497,7 +497,6 @@ testQemuGetLatestCapsForArch(const char *arch, DIR *dir =3D NULL; int rc; char *fullsuffix =3D NULL; - char *tmp =3D NULL; unsigned long maxver =3D 0; unsigned long ver; g_autofree char *maxname =3D NULL; @@ -509,7 +508,7 @@ testQemuGetLatestCapsForArch(const char *arch, goto cleanup; =20 while ((rc =3D virDirRead(dir, &ent, TEST_QEMU_CAPS_PATH)) > 0) { - VIR_FREE(tmp); + g_autofree char *tmp =3D NULL; =20 tmp =3D g_strdup(STRSKIP(ent->d_name, "caps_")); =20 @@ -543,7 +542,6 @@ testQemuGetLatestCapsForArch(const char *arch, ret =3D g_strdup_printf("%s/%s", TEST_QEMU_CAPS_PATH, maxname); =20 cleanup: - VIR_FREE(tmp); VIR_FREE(fullsuffix); virDirClose(&dir); return ret; diff --git a/tests/utiltest.c b/tests/utiltest.c index 2bff7859dc..2921ae8d8c 100644 --- a/tests/utiltest.c +++ b/tests/utiltest.c @@ -42,23 +42,18 @@ static int testIndexToDiskName(const void *data G_GNUC_UNUSED) { size_t i; - char *diskName =3D NULL; =20 for (i =3D 0; i < G_N_ELEMENTS(diskNames); ++i) { - VIR_FREE(diskName); + g_autofree char *diskName =3D NULL; =20 diskName =3D virIndexToDiskName(i, "sd"); =20 if (STRNEQ(diskNames[i], diskName)) { virTestDifference(stderr, diskNames[i], diskName); - VIR_FREE(diskName); - return -1; } } =20 - VIR_FREE(diskName); - return 0; } =20 @@ -69,10 +64,9 @@ testDiskNameToIndex(const void *data G_GNUC_UNUSED) { size_t i; int idx; - char *diskName =3D NULL; =20 for (i =3D 0; i < 100000; ++i) { - VIR_FREE(diskName); + g_autofree char *diskName =3D NULL; =20 diskName =3D virIndexToDiskName(i, "sd"); idx =3D virDiskNameToIndex(diskName); @@ -80,15 +74,10 @@ testDiskNameToIndex(const void *data G_GNUC_UNUSED) if (idx < 0 || idx !=3D i) { VIR_TEST_DEBUG("\nExpect [%zu]", i); VIR_TEST_DEBUG("Actual [%d]", idx); - - VIR_FREE(diskName); - return -1; } } =20 - VIR_FREE(diskName); - return 0; } =20 --=20 2.26.2 From nobody Fri Apr 19 14:20:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 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=1595979824; cv=none; d=zohomail.com; s=zohoarc; b=W3YPXku0D3M/pqstEwFTHfT1dlchvQo3UP6kd3eCj3TE1rFutkRlxU/XE6HfWR6T7TwY1FW8qOhTfxrngFEIY61F836F1FOOz6XuT+w7ORF/LkXmq4djk14Gp4A92b6Xs/m6zmbmSjgcyqddMYDgd+9al7eWdlORlFqVlfGMjJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595979824; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=s27pTY9Vw0fkWPPeefZ3f3uD2a6PxUaCVVHHGsxdMEs=; b=nsitZRl0W0AQd6zuXZk8q4yoDf1NeqHf0AagXinaew67jriuvfMBv5Bi7Sk6qBnMfKHoknLPzjImtVfJrBzds9A+Ic8ChjC3a2KVJeUOvcwic5XtRwocXCRmJHuxtF3ha8pKRfYxxoNEsWv4IHSTI0XfVIjlzs8kIvQsmWVyD6U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 1595979824469212.42772812708733; Tue, 28 Jul 2020 16:43:44 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-411-zp7uEIEOOrug65IE4Mu9Wg-1; Tue, 28 Jul 2020 19:43:40 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 554C491271; Tue, 28 Jul 2020 23:43:34 +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 E541671909; Tue, 28 Jul 2020 23:43: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 B671B1800FDE; Tue, 28 Jul 2020 23:43:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06SNhSjm004279 for ; Tue, 28 Jul 2020 19:43:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id CAB15100238C; Tue, 28 Jul 2020 23:43:28 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2744410013C4 for ; Tue, 28 Jul 2020 23:43:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595979823; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=s27pTY9Vw0fkWPPeefZ3f3uD2a6PxUaCVVHHGsxdMEs=; b=GJrktsLoSh2VTtJtUsK6SJM1kU62bjNXe0YZuUwdGkA6rSFiMZm33n3zJfuuYa6lDpYWzC +3T6Zs6PDo3Hd5dHGye7onHB4jH0QH/iqBakKVWdMgh3xLU19CBzLIVhy9KItlMk3WkyQf YOZ+p+qsCwlmq5CwTGNektT7vlJxtJY= X-MC-Unique: zp7uEIEOOrug65IE4Mu9Wg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/6] tests: qemucapsxml2xmltest: split variable declaration Date: Wed, 29 Jul 2020 01:43:17 +0200 Message-Id: <3955ec7a23df50ccad747d5876666a2fa073ed02.1595979782.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) One variable per line. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- tests/qemucaps2xmltest.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 7a5125fea6..f087b037ce 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -137,7 +137,8 @@ testQemuCapsXML(const void *opaque) { int ret =3D -1; const testQemuData *data =3D opaque; - char *capsFile =3D NULL, *xmlFile =3D NULL; + char *capsFile =3D NULL + char *xmlFile =3D NULL; char *capsData =3D NULL; char *capsXml =3D NULL; virCapsPtr capsProvided =3D NULL; --=20 2.26.2 From nobody Fri Apr 19 14:20:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 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=1595979827; cv=none; d=zohomail.com; s=zohoarc; b=aa8oDjhLSYba28k1LtVDlP6e20ig6/vkcKcu4Hu69GvSdJQeggaWIpVJHjxwqD1/vrNqu1bh6mlO3HvtshmcKm1HgjA5KjmzQKt5/myur6XRr7SUguMEpR1E6HdZNE4KNFxjOz48TbvYjllVuOrF73CPVzHh6QzHU3v301aLF6Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595979827; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=errXqNdGwHladX7ZAVFl1FPSmy1+IvMRI+W1GiwFuiI=; b=FXD+ScSdINDTZcvjdNtFuYIDy19deSyb8GYcWEfDsISYB3zo06fswt9cGbZUG3alGe8+2SBzdc+/1BC/g4O2lpv56FQ3RsFdlxz2frm+ZWO4GqdWnuReyEHoBLzdTVzu7BLGOgWbWbjqhpY/79u64RaFTNJY6mSULrOpkIwzJ+s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 1595979827695722.8810028441479; Tue, 28 Jul 2020 16:43:47 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-359-IRNaHinNNmaSK_ESGYqLWg-1; Tue, 28 Jul 2020 19:43:43 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6FF0019067E4; Tue, 28 Jul 2020 23:43:36 +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 50540712F3; Tue, 28 Jul 2020 23:43: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 1DB5FA35B6; Tue, 28 Jul 2020 23:43:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06SNhUPX004291 for ; Tue, 28 Jul 2020 19:43:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4DC82100238C; Tue, 28 Jul 2020 23:43:30 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41DDA10013C4 for ; Tue, 28 Jul 2020 23:43:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595979826; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=errXqNdGwHladX7ZAVFl1FPSmy1+IvMRI+W1GiwFuiI=; b=a6jAOzphjZFT3pz7Gj0ySIfsVLKRT6XLIC2g5vRL635gRqC0Pc6Voi5G49zgAUrDlplrMy agTjM+zaC71KDyugD2OVyIjxle6qiinnjpXoi2U662PlDuZ6isAJkKfn1+VszbEHt6CYox 9Pag66+9FybqluV4RyTqUcgrNNtXeUI= X-MC-Unique: IRNaHinNNmaSK_ESGYqLWg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/6] tests: qemu: use g_autofree where possible Date: Wed, 29 Jul 2020 01:43:18 +0200 Message-Id: <89194c776e6780087da17909601ad61751413248.1595979782.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- tests/qemuagenttest.c | 9 +++----- tests/qemucapabilitiestest.c | 18 +++++---------- tests/qemucaps2xmltest.c | 20 +++++------------ tests/qemudomainsnapshotxml2xmltest.c | 9 +++----- tests/qemuhotplugtest.c | 32 +++++++++------------------ tests/qemumemlocktest.c | 10 +++------ tests/qemumigparamstest.c | 24 +++++++------------- tests/qemumonitortestutils.c | 15 +++++-------- tests/qemusecuritymock.c | 12 ++++------ tests/qemuxml2argvtest.c | 15 +++++-------- tests/qemuxml2xmltest.c | 6 ++--- tests/testutilsqemu.c | 7 ++---- 12 files changed, 57 insertions(+), 120 deletions(-) diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 2c3a1efb09..347438c14a 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -173,7 +173,7 @@ testQemuAgentGetFSInfoCommon(virDomainXMLOptionPtr xmlo= pt, virDomainDefPtr *def) { int ret =3D -1; - char *domain_filename =3D NULL; + g_autofree char *domain_filename =3D NULL; qemuMonitorTestPtr ret_test =3D NULL; virDomainDefPtr ret_def =3D NULL; =20 @@ -233,7 +233,6 @@ testQemuAgentGetFSInfoCommon(virDomainXMLOptionPtr xmlo= pt, ret =3D 0; =20 cleanup: - VIR_FREE(domain_filename); if (ret_test) qemuMonitorTestFree(ret_test); virDomainDefFree(ret_def); @@ -664,7 +663,7 @@ testQemuAgentArbitraryCommand(const void *data) virDomainXMLOptionPtr xmlopt =3D (virDomainXMLOptionPtr)data; qemuMonitorTestPtr test =3D qemuMonitorTestNewAgent(xmlopt); int ret =3D -1; - char *reply =3D NULL; + g_autofree char *reply =3D NULL; =20 if (!test) return -1; @@ -693,7 +692,6 @@ testQemuAgentArbitraryCommand(const void *data) ret =3D 0; =20 cleanup: - VIR_FREE(reply); qemuMonitorTestFree(test); return ret; } @@ -713,7 +711,7 @@ testQemuAgentTimeout(const void *data) { virDomainXMLOptionPtr xmlopt =3D (virDomainXMLOptionPtr)data; qemuMonitorTestPtr test =3D qemuMonitorTestNewAgent(xmlopt); - char *reply =3D NULL; + g_autofree char *reply =3D NULL; int ret =3D -1; =20 if (!test) @@ -757,7 +755,6 @@ testQemuAgentTimeout(const void *data) ret =3D 0; =20 cleanup: - VIR_FREE(reply); qemuMonitorTestFree(test); return ret; } diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 5b32ac1451..be8741dd5f 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -71,12 +71,12 @@ testQemuCaps(const void *opaque) { int ret =3D -1; testQemuData *data =3D (void *) opaque; - char *repliesFile =3D NULL; - char *capsFile =3D NULL; + g_autofree char *repliesFile =3D NULL; + g_autofree char *capsFile =3D NULL; qemuMonitorTestPtr mon =3D NULL; virQEMUCapsPtr capsActual =3D NULL; - char *binary =3D NULL; - char *actual =3D NULL; + g_autofree char *binary =3D NULL; + g_autofree char *actual =3D NULL; unsigned int fakeMicrocodeVersion =3D 0; const char *p; =20 @@ -133,10 +133,6 @@ testQemuCaps(const void *opaque) =20 ret =3D 0; cleanup: - VIR_FREE(repliesFile); - VIR_FREE(capsFile); - VIR_FREE(actual); - VIR_FREE(binary); qemuMonitorTestFree(mon); virObjectUnref(capsActual); return ret; @@ -148,10 +144,10 @@ testQemuCapsCopy(const void *opaque) { int ret =3D -1; const testQemuData *data =3D opaque; - char *capsFile =3D NULL; + g_autofree char *capsFile =3D NULL; virQEMUCapsPtr orig =3D NULL; virQEMUCapsPtr copy =3D NULL; - char *actual =3D NULL; + g_autofree char *actual =3D NULL; =20 capsFile =3D g_strdup_printf("%s/%s_%s.%s.xml", data->outputDir, data->prefix, data->versio= n, @@ -173,10 +169,8 @@ testQemuCapsCopy(const void *opaque) ret =3D 0; =20 cleanup: - VIR_FREE(capsFile); virObjectUnref(orig); virObjectUnref(copy); - VIR_FREE(actual); return ret; } =20 diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index f087b037ce..5ff4374935 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -55,7 +55,7 @@ testQemuGetCaps(char *caps) xmlDocPtr xml; xmlXPathContextPtr ctxt =3D NULL; ssize_t i, n; - xmlNodePtr *nodes =3D NULL; + g_autofree xmlNodePtr *nodes =3D NULL; =20 if (!(xml =3D virXMLParseStringCtxt(caps, "(test caps)", &ctxt))) goto error; @@ -69,26 +69,22 @@ testQemuGetCaps(char *caps) goto error; =20 for (i =3D 0; i < n; i++) { - char *str =3D virXMLPropString(nodes[i], "name"); + g_autofree char *str =3D virXMLPropString(nodes[i], "name"); if (str) { int flag =3D virQEMUCapsTypeFromString(str); if (flag < 0) { fprintf(stderr, "Unknown qemu capabilities flag %s", str); - VIR_FREE(str); goto error; } - VIR_FREE(str); virQEMUCapsSet(qemuCaps, flag); } } =20 - VIR_FREE(nodes); xmlFreeDoc(xml); xmlXPathFreeContext(ctxt); return qemuCaps; =20 error: - VIR_FREE(nodes); virObjectUnref(qemuCaps); xmlFreeDoc(xml); xmlXPathFreeContext(ctxt); @@ -137,10 +133,10 @@ testQemuCapsXML(const void *opaque) { int ret =3D -1; const testQemuData *data =3D opaque; - char *capsFile =3D NULL - char *xmlFile =3D NULL; - char *capsData =3D NULL; - char *capsXml =3D NULL; + g_autofree char *capsFile =3D NULL; + g_autofree char *xmlFile =3D NULL; + g_autofree char *capsData =3D NULL; + g_autofree char *capsXml =3D NULL; virCapsPtr capsProvided =3D NULL; =20 xmlFile =3D g_strdup_printf("%s/caps.%s.xml", data->outputDir, data->a= rchName); @@ -164,10 +160,6 @@ testQemuCapsXML(const void *opaque) =20 ret =3D 0; cleanup: - VIR_FREE(xmlFile); - VIR_FREE(capsFile); - VIR_FREE(capsXml); - VIR_FREE(capsData); virObjectUnref(capsProvided); return ret; } diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapsh= otxml2xmltest.c index 220dae33b9..6c10f3e953 100644 --- a/tests/qemudomainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -31,9 +31,9 @@ testCompareXMLToXMLFiles(const char *inxml, const char *uuid, unsigned int flags) { - char *inXmlData =3D NULL; - char *outXmlData =3D NULL; - char *actual =3D NULL; + g_autofree char *inXmlData =3D NULL; + g_autofree char *outXmlData =3D NULL; + g_autofree char *actual =3D NULL; int ret =3D -1; unsigned int parseflags =3D VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; unsigned int formatflags =3D VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE; @@ -82,9 +82,6 @@ testCompareXMLToXMLFiles(const char *inxml, ret =3D 0; =20 cleanup: - VIR_FREE(inXmlData); - VIR_FREE(outXmlData); - VIR_FREE(actual); return ret; } =20 diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index ba30cf5aa6..9d7d2e44e8 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -203,7 +203,7 @@ testQemuHotplugCheckResult(virDomainObjPtr vm, const char *expectedFile, bool fail) { - char *actual; + g_autofree char *actual =3D NULL; int ret; =20 actual =3D virDomainDefFormat(vm->def, driver.xmlopt, @@ -224,7 +224,6 @@ testQemuHotplugCheckResult(virDomainObjPtr vm, ret =3D -1; } =20 - VIR_FREE(actual); return ret; } =20 @@ -233,12 +232,12 @@ testQemuHotplug(const void *data) { int ret =3D -1; struct qemuHotplugTestData *test =3D (struct qemuHotplugTestData *) da= ta; - char *domain_filename =3D NULL; - char *device_filename =3D NULL; - char *result_filename =3D NULL; - char *domain_xml =3D NULL; - char *device_xml =3D NULL; - char *result_xml =3D NULL; + g_autofree char *domain_filename =3D NULL; + g_autofree char *device_filename =3D NULL; + g_autofree char *result_filename =3D NULL; + g_autofree char *domain_xml =3D NULL; + g_autofree char *device_xml =3D NULL; + g_autofree char *result_xml =3D NULL; const char *const *tmp; bool fail =3D test->fail; bool keep =3D test->keep; @@ -340,12 +339,6 @@ testQemuHotplug(const void *data) virObjectLock(priv->mon); =20 cleanup: - VIR_FREE(domain_filename); - VIR_FREE(device_filename); - VIR_FREE(result_filename); - VIR_FREE(domain_xml); - VIR_FREE(device_xml); - VIR_FREE(result_xml); /* don't dispose test monitor with VM */ if (priv) priv->mon =3D NULL; @@ -416,7 +409,7 @@ testQemuHotplugCpuPrepare(const char *test, { qemuDomainObjPrivatePtr priv =3D NULL; virCapsPtr caps =3D NULL; - char *prefix =3D NULL; + g_autofree char *prefix =3D NULL; struct testQemuHotplugCpuData *data =3D NULL; =20 prefix =3D g_strdup_printf("%s/qemuhotplugtestcpus/%s", abs_srcdir, te= st); @@ -468,14 +461,11 @@ testQemuHotplugCpuPrepare(const char *test, if (qemuDomainRefreshVcpuInfo(&driver, data->vm, 0, false) < 0) goto error; =20 - VIR_FREE(prefix); - return data; =20 error: virObjectUnref(caps); testQemuHotplugCpuDataFree(data); - VIR_FREE(prefix); return NULL; } =20 @@ -484,8 +474,8 @@ static int testQemuHotplugCpuFinalize(struct testQemuHotplugCpuData *data) { int ret =3D -1; - char *activeXML =3D NULL; - char *configXML =3D NULL; + g_autofree char *activeXML =3D NULL; + g_autofree char *configXML =3D NULL; =20 if (data->file_xml_res_live) { if (!(activeXML =3D virDomainDefFormat(data->vm->def, driver.xmlop= t, @@ -509,8 +499,6 @@ testQemuHotplugCpuFinalize(struct testQemuHotplugCpuDat= a *data) ret =3D 0; =20 cleanup: - VIR_FREE(activeXML); - VIR_FREE(configXML); return ret; } =20 diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 3f18fed1c3..0867e3a255 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -31,7 +31,7 @@ testCompareMemLock(const void *data) { const struct testInfo *info =3D data; virDomainDefPtr def =3D NULL; - char *xml =3D NULL; + g_autofree char *xml =3D NULL; int ret =3D -1; =20 xml =3D g_strdup_printf("%s/qemumemlockdata/qemumemlock-%s.xml", abs_s= rcdir, @@ -46,7 +46,6 @@ testCompareMemLock(const void *data) =20 cleanup: virDomainDefFree(def); - VIR_FREE(xml); =20 return ret; } @@ -57,7 +56,7 @@ static int mymain(void) { int ret =3D 0; - char *fakerootdir; + g_autofree char *fakerootdir =3D NULL; virQEMUCapsPtr qemuCaps =3D NULL; =20 fakerootdir =3D g_strdup(FAKEROOTDIRTEMPLATE); @@ -69,10 +68,8 @@ mymain(void) =20 g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, TRUE); =20 - if (qemuTestDriverInit(&driver) < 0) { - VIR_FREE(fakerootdir); + if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; - } =20 driver.privileged =3D true; =20 @@ -154,7 +151,6 @@ mymain(void) virFileDeleteTree(fakerootdir); =20 qemuTestDriverFree(&driver); - VIR_FREE(fakerootdir); =20 return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index 057cde5e72..f4357e0f53 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -59,11 +59,11 @@ qemuMigParamsTestXML2XML(const void *opaque) { const qemuMigParamsData *data =3D opaque; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - char *xmlFile =3D NULL; + g_autofree char *xmlFile =3D NULL; xmlDocPtr doc =3D NULL; xmlXPathContextPtr ctxt =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; - char *actualXML =3D NULL; + g_autofree char *actualXML =3D NULL; int ret =3D -1; =20 xmlFile =3D g_strdup_printf("%s/qemumigparamsdata/%s.xml", abs_srcdir, @@ -86,8 +86,6 @@ qemuMigParamsTestXML2XML(const void *opaque) ret =3D 0; =20 cleanup: - VIR_FREE(xmlFile); - VIR_FREE(actualXML); qemuMigrationParamsFree(migParams); xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); @@ -100,12 +98,12 @@ qemuMigParamsTestXML(const void *opaque) { const qemuMigParamsData *data =3D opaque; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - char *replyFile =3D NULL; - char *xmlFile =3D NULL; + g_autofree char *replyFile =3D NULL; + g_autofree char *xmlFile =3D NULL; qemuMonitorTestPtr mon =3D NULL; virJSONValuePtr params =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; - char *actualXML =3D NULL; + g_autofree char *actualXML =3D NULL; int ret =3D -1; =20 replyFile =3D g_strdup_printf("%s/qemumigparamsdata/%s.reply", @@ -134,9 +132,6 @@ qemuMigParamsTestXML(const void *opaque) ret =3D 0; =20 cleanup: - VIR_FREE(replyFile); - VIR_FREE(xmlFile); - VIR_FREE(actualXML); virJSONValueFree(params); qemuMigrationParamsFree(migParams); qemuMonitorTestFree(mon); @@ -148,13 +143,13 @@ static int qemuMigParamsTestJSON(const void *opaque) { const qemuMigParamsData *data =3D opaque; - char *replyFile =3D NULL; - char *jsonFile =3D NULL; + g_autofree char *replyFile =3D NULL; + g_autofree char *jsonFile =3D NULL; qemuMonitorTestPtr mon =3D NULL; virJSONValuePtr paramsIn =3D NULL; virJSONValuePtr paramsOut =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; - char *actualJSON =3D NULL; + g_autofree char *actualJSON =3D NULL; int ret =3D -1; =20 replyFile =3D g_strdup_printf("%s/qemumigparamsdata/%s.reply", @@ -182,9 +177,6 @@ qemuMigParamsTestJSON(const void *opaque) ret =3D 0; =20 cleanup: - VIR_FREE(replyFile); - VIR_FREE(jsonFile); - VIR_FREE(actualJSON); virJSONValueFree(paramsIn); virJSONValueFree(paramsOut); qemuMigrationParamsFree(migParams); diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index c7396e4361..08e90757b1 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -724,7 +724,7 @@ qemuMonitorTestProcessGuestAgentSync(qemuMonitorTestPtr= test, virJSONValuePtr args; unsigned long long id; const char *cmdname; - char *retmsg =3D NULL; + g_autofree char *retmsg =3D NULL; int ret =3D -1; =20 if (!(val =3D virJSONValueFromString(cmdstr))) @@ -757,7 +757,6 @@ qemuMonitorTestProcessGuestAgentSync(qemuMonitorTestPtr= test, =20 cleanup: virJSONValueFree(val); - VIR_FREE(retmsg); return ret; } =20 @@ -908,7 +907,7 @@ qemuMonitorTestProcessCommandWithArgStr(qemuMonitorTest= Ptr test, struct qemuMonitorTestHandlerData *data =3D item->opaque; virJSONValuePtr val =3D NULL; virJSONValuePtr args; - char *argstr =3D NULL; + g_autofree char *argstr =3D NULL; const char *cmdname; int ret =3D -1; =20 @@ -947,7 +946,6 @@ qemuMonitorTestProcessCommandWithArgStr(qemuMonitorTest= Ptr test, ret =3D qemuMonitorTestAddResponse(test, data->response); =20 cleanup: - VIR_FREE(argstr); virJSONValueFree(val); return ret; } @@ -1228,7 +1226,7 @@ qemuMonitorTestNewFromFile(const char *fileName, bool simple) { qemuMonitorTestPtr test =3D NULL; - char *json =3D NULL; + g_autofree char *json =3D NULL; char *tmp; char *singleReply; =20 @@ -1277,7 +1275,6 @@ qemuMonitorTestNewFromFile(const char *fileName, goto error; =20 cleanup: - VIR_FREE(json); return test; =20 error: @@ -1334,14 +1331,13 @@ qemuMonitorTestFullAddItem(qemuMonitorTestPtr test, const char *response, size_t line) { - char *cmderr; + g_autofree char *cmderr =3D NULL; int ret; =20 cmderr =3D g_strdup_printf("wrong expected command in %s:%zu: ", filen= ame, line); =20 ret =3D qemuMonitorTestAddItemVerbatim(test, command, cmderr, response= ); =20 - VIR_FREE(cmderr); return ret; } =20 @@ -1369,7 +1365,7 @@ qemuMonitorTestNewFromFileFull(const char *fileName, virHashTablePtr qmpschema) { qemuMonitorTestPtr ret =3D NULL; - char *jsonstr =3D NULL; + g_autofree char *jsonstr =3D NULL; char *tmp; size_t line =3D 0; =20 @@ -1435,7 +1431,6 @@ qemuMonitorTestNewFromFileFull(const char *fileName, } =20 cleanup: - VIR_FREE(jsonstr); return ret; =20 error: diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c index ad182c7bf7..6da8a91a9e 100644 --- a/tests/qemusecuritymock.c +++ b/tests/qemusecuritymock.c @@ -129,7 +129,7 @@ virFileGetXAttrQuiet(const char *path, char **value) { int ret =3D -1; - char *key; + g_autofree char *key =3D NULL; char *val; =20 key =3D get_key(path, name); @@ -148,7 +148,6 @@ virFileGetXAttrQuiet(const char *path, ret =3D 0; cleanup: virMutexUnlock(&m); - VIR_FREE(key); return ret; } =20 @@ -186,8 +185,8 @@ int virFileSetXAttr(const char *path, const char *value) { int ret =3D -1; - char *key; - char *val; + g_autofree char *key =3D NULL; + g_autofree char *val =3D NULL; =20 key =3D get_key(path, name); val =3D g_strdup(value); @@ -203,8 +202,6 @@ int virFileSetXAttr(const char *path, ret =3D 0; cleanup: virMutexUnlock(&m); - VIR_FREE(val); - VIR_FREE(key); return ret; } =20 @@ -213,7 +210,7 @@ int virFileRemoveXAttr(const char *path, const char *name) { int ret =3D -1; - char *key; + g_autofree char *key =3D NULL; =20 key =3D get_key(path, name); =20 @@ -225,7 +222,6 @@ int virFileRemoveXAttr(const char *path, errno =3D ENODATA; =20 virMutexUnlock(&m); - VIR_FREE(key); return ret; } =20 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ebc4cd6240..9388f7bf39 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -105,7 +105,7 @@ static virStoragePoolPtr fakeStoragePoolLookupByName(virConnectPtr conn, const char *name) { - char *xmlpath =3D NULL; + g_autofree char *xmlpath =3D NULL; virStoragePoolPtr ret =3D NULL; =20 if (STRNEQ(name, "inactive")) { @@ -122,7 +122,6 @@ fakeStoragePoolLookupByName(virConnectPtr conn, ret =3D virGetStoragePool(conn, name, fakeUUID, NULL, NULL); =20 cleanup: - VIR_FREE(xmlpath); return ret; } =20 @@ -196,7 +195,7 @@ static char * fakeStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags_unused G_GNUC_UNUSED) { - char *xmlpath =3D NULL; + g_autofree char *xmlpath =3D NULL; char *xmlbuf =3D NULL; =20 if (STREQ(pool->name, "inactive")) { @@ -215,7 +214,6 @@ fakeStoragePoolGetXMLDesc(virStoragePoolPtr pool, } =20 cleanup: - VIR_FREE(xmlpath); =20 return xmlbuf; } @@ -560,8 +558,8 @@ static int testCompareXMLToArgv(const void *data) { struct testQemuInfo *info =3D (void *) data; - char *migrateURI =3D NULL; - char *actualargv =3D NULL; + g_autofree char *migrateURI =3D NULL; + g_autofree char *actualargv =3D NULL; unsigned int flags =3D info->flags; unsigned int parseFlags =3D info->parseFlags; int ret =3D -1; @@ -689,14 +687,12 @@ testCompareXMLToArgv(const void *data) =20 cleanup: VIR_FREE(log); - VIR_FREE(actualargv); virDomainChrSourceDefClear(&monitor_chr); virCommandFree(cmd); virObjectUnref(vm); virSetConnectSecret(NULL); virSetConnectStorage(NULL); virObjectUnref(conn); - VIR_FREE(migrateURI); if (info->arch !=3D VIR_ARCH_NONE && info->arch !=3D VIR_ARCH_X86_64) qemuTestSetHostArch(&driver, VIR_ARCH_NONE); =20 @@ -719,7 +715,7 @@ static int mymain(void) { int ret =3D 0; - char *fakerootdir; + g_autofree char *fakerootdir =3D NULL; virHashTablePtr capslatest =3D NULL; =20 fakerootdir =3D g_strdup(FAKEROOTDIRTEMPLATE); @@ -3366,7 +3362,6 @@ mymain(void) =20 VIR_FREE(driver.config->nbdTLSx509certdir); qemuTestDriverFree(&driver); - VIR_FREE(fakerootdir); virHashFree(capslatest); virFileWrapperClearPrefixes(); =20 diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index c17e3303b0..ccb810ee08 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -55,7 +55,7 @@ testCompareStatusXMLToXMLFiles(const void *opaque) { const struct testQemuInfo *data =3D opaque; virDomainObjPtr obj =3D NULL; - char *actual =3D NULL; + g_autofree char *actual =3D NULL; int ret =3D -1; =20 if (!(obj =3D virDomainObjParseFile(data->infile, driver.xmlopt, @@ -85,7 +85,6 @@ testCompareStatusXMLToXMLFiles(const void *opaque) =20 cleanup: virDomainObjEndAPI(&obj); - VIR_FREE(actual); return ret; } =20 @@ -132,7 +131,7 @@ static int mymain(void) { int ret =3D 0; - char *fakerootdir; + g_autofree char *fakerootdir =3D NULL; virQEMUDriverConfigPtr cfg =3D NULL; virHashTablePtr capslatest =3D NULL; g_autoptr(virConnect) conn =3D NULL; @@ -1501,7 +1500,6 @@ mymain(void) =20 virHashFree(capslatest); qemuTestDriverFree(&driver); - VIR_FREE(fakerootdir); virFileWrapperClearPrefixes(); =20 return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 855e51460b..51ac59bade 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -220,15 +220,13 @@ virCapsPtr testQemuCapsInit(void) } =20 if (virTestGetDebug()) { - char *caps_str; + g_autofree char *caps_str =3D NULL; =20 caps_str =3D virCapabilitiesFormatXML(caps); if (!caps_str) goto cleanup; =20 VIR_TEST_DEBUG("QEMU driver capabilities:\n%s", caps_str); - - VIR_FREE(caps_str); } =20 return caps; @@ -496,7 +494,7 @@ testQemuGetLatestCapsForArch(const char *arch, struct dirent *ent; DIR *dir =3D NULL; int rc; - char *fullsuffix =3D NULL; + g_autofree char *fullsuffix =3D NULL; unsigned long maxver =3D 0; unsigned long ver; g_autofree char *maxname =3D NULL; @@ -542,7 +540,6 @@ testQemuGetLatestCapsForArch(const char *arch, ret =3D g_strdup_printf("%s/%s", TEST_QEMU_CAPS_PATH, maxname); =20 cleanup: - VIR_FREE(fullsuffix); virDirClose(&dir); return ret; } --=20 2.26.2 From nobody Fri Apr 19 14:20:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 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=1595979828; cv=none; d=zohomail.com; s=zohoarc; b=jTeDvH/stfas314Log53ORRn8Yj6alvGn/ZCAkCFbJdR6Yghg6tiUdfXB6Abqe18hSJ1FSPqdRTwwldcLwZtJJ+i4D9+JotZTPFHWJ1bxa4nZ846vTMw0PDKic0cf/TGL4+NN6V9QO92VyDG0LRswUCUxlx4HP4431KyafWJnuo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595979828; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0PzukbpdLizOLjwhlKWS5lNirbz48IGuy2Kv4wwinjw=; b=M4uRmN8XTedfQcrjXAbLBXxBoOahWJL9hzfIhMnI8T/MFPUtrmh3SlbefiydJATbULcDASYNZ+8O4KVOUx7TVcytO0DyZcJpCpqQy6SCMBsJyjdiQZYiyidN8wvpMgkpEd+54TuB/b0AyCZaEl9/qw4quadhQFQCdxa/YKA6DmQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 1595979828249923.7524192543672; Tue, 28 Jul 2020 16:43:48 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-485-xHiUJvgmNe-fuzdd-4_Diw-1; Tue, 28 Jul 2020 19:43:44 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id AC2AE108C209; Tue, 28 Jul 2020 23:43:38 +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 8C4C1712F3; Tue, 28 Jul 2020 23:43:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5CB461800FDD; Tue, 28 Jul 2020 23:43:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06SNhVTS004303 for ; Tue, 28 Jul 2020 19:43:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7890E1001B2C; Tue, 28 Jul 2020 23:43:31 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id BEA5F10013C4 for ; Tue, 28 Jul 2020 23:43:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595979827; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0PzukbpdLizOLjwhlKWS5lNirbz48IGuy2Kv4wwinjw=; b=JSlFLlU8Jrc/ADYtdKbhnitpIKKtAivMCfMmAbCxPc37Vc0DoQ2j17BwAKRmFDDLpWxHNS aC/zJ3LVBx6IqO6lVJ8TS9QGQCPxBCn8nrbXSeLCOLnw8Rl2nxMWWOT9Xrh3sA4ysHG+x7 MKake/yb1AcE34H9cc03wfsL7JLpQYo= X-MC-Unique: xHiUJvgmNe-fuzdd-4_Diw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/6] tests: qemu: use g_autoptr where possible Date: Wed, 29 Jul 2020 01:43:19 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- tests/qemuagenttest.c | 7 ++----- tests/qemublocktest.c | 2 +- tests/qemucapabilitiestest.c | 9 +++------ tests/qemucaps2xmltest.c | 7 ++----- tests/qemuhotplugtest.c | 6 ++---- tests/qemumemlocktest.c | 7 ++----- tests/qemumigparamstest.c | 24 ++++++++---------------- tests/qemumonitortestutils.c | 9 +++------ tests/qemuxml2argvtest.c | 9 +++------ tests/qemuxml2xmltest.c | 3 +-- 10 files changed, 27 insertions(+), 56 deletions(-) diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 347438c14a..607bd97b5c 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -175,7 +175,7 @@ testQemuAgentGetFSInfoCommon(virDomainXMLOptionPtr xmlo= pt, int ret =3D -1; g_autofree char *domain_filename =3D NULL; qemuMonitorTestPtr ret_test =3D NULL; - virDomainDefPtr ret_def =3D NULL; + g_autoptr(virDomainDef) ret_def =3D NULL; =20 if (!test || !def) return -1; @@ -235,8 +235,6 @@ testQemuAgentGetFSInfoCommon(virDomainXMLOptionPtr xmlo= pt, cleanup: if (ret_test) qemuMonitorTestFree(ret_test); - virDomainDefFree(ret_def); - return ret; } =20 @@ -400,7 +398,7 @@ qemuAgentShutdownTestMonitorHandler(qemuMonitorTestPtr = test, const char *cmdstr) { struct qemuAgentShutdownTestData *data; - virJSONValuePtr val =3D NULL; + g_autoptr(virJSONValue) val =3D NULL; virJSONValuePtr args; const char *cmdname; const char *mode; @@ -447,7 +445,6 @@ qemuAgentShutdownTestMonitorHandler(qemuMonitorTestPtr = test, ret =3D 0; =20 cleanup: - virJSONValueFree(val); return ret; =20 } diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 025e96ab4b..fb5319d7bd 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -987,7 +987,7 @@ mymain(void) struct testQemuBlockBitmapBlockcopyData blockbitmapblockcopydata; struct testQemuBlockBitmapBlockcommitData blockbitmapblockcommitdata; char *capslatest_x86_64 =3D NULL; - virQEMUCapsPtr caps_x86_64 =3D NULL; + g_autoptr(virQEMUCaps) caps_x86_64 =3D NULL; g_autoptr(virHashTable) qmp_schema_x86_64 =3D NULL; virJSONValuePtr qmp_schemaroot_x86_64_blockdev_add =3D NULL; g_autoptr(virStorageSource) bitmapSourceChain =3D NULL; diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index be8741dd5f..81f29c6493 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -74,7 +74,7 @@ testQemuCaps(const void *opaque) g_autofree char *repliesFile =3D NULL; g_autofree char *capsFile =3D NULL; qemuMonitorTestPtr mon =3D NULL; - virQEMUCapsPtr capsActual =3D NULL; + g_autoptr(virQEMUCaps) capsActual =3D NULL; g_autofree char *binary =3D NULL; g_autofree char *actual =3D NULL; unsigned int fakeMicrocodeVersion =3D 0; @@ -134,7 +134,6 @@ testQemuCaps(const void *opaque) ret =3D 0; cleanup: qemuMonitorTestFree(mon); - virObjectUnref(capsActual); return ret; } =20 @@ -145,8 +144,8 @@ testQemuCapsCopy(const void *opaque) int ret =3D -1; const testQemuData *data =3D opaque; g_autofree char *capsFile =3D NULL; - virQEMUCapsPtr orig =3D NULL; - virQEMUCapsPtr copy =3D NULL; + g_autoptr(virQEMUCaps) orig =3D NULL; + g_autoptr(virQEMUCaps) copy =3D NULL; g_autofree char *actual =3D NULL; =20 capsFile =3D g_strdup_printf("%s/%s_%s.%s.xml", @@ -169,8 +168,6 @@ testQemuCapsCopy(const void *opaque) ret =3D 0; =20 cleanup: - virObjectUnref(orig); - virObjectUnref(copy); return ret; } =20 diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 5ff4374935..5316a221ff 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -94,7 +94,7 @@ testQemuGetCaps(char *caps) static virCapsPtr testGetCaps(char *capsData, const testQemuData *data) { - virQEMUCapsPtr qemuCaps =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; virCapsPtr caps =3D NULL; virArch arch =3D virArchFromString(data->archName); g_autofree char *binary =3D NULL; @@ -119,11 +119,9 @@ testGetCaps(char *capsData, const testQemuData *data) goto error; } =20 - virObjectUnref(qemuCaps); return caps; =20 error: - virObjectUnref(qemuCaps); virObjectUnref(caps); return NULL; } @@ -137,7 +135,7 @@ testQemuCapsXML(const void *opaque) g_autofree char *xmlFile =3D NULL; g_autofree char *capsData =3D NULL; g_autofree char *capsXml =3D NULL; - virCapsPtr capsProvided =3D NULL; + g_autoptr(virCaps) capsProvided =3D NULL; =20 xmlFile =3D g_strdup_printf("%s/caps.%s.xml", data->outputDir, data->a= rchName); =20 @@ -160,7 +158,6 @@ testQemuCapsXML(const void *opaque) =20 ret =3D 0; cleanup: - virObjectUnref(capsProvided); return ret; } =20 diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 9d7d2e44e8..ba644abe8a 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -244,7 +244,7 @@ testQemuHotplug(const void *data) unsigned int device_parse_flags =3D 0; virDomainObjPtr vm =3D NULL; virDomainDeviceDefPtr dev =3D NULL; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; qemuMonitorTestPtr test_mon =3D NULL; qemuDomainObjPrivatePtr priv =3D NULL; =20 @@ -349,7 +349,6 @@ testQemuHotplug(const void *data) test->vm =3D NULL; } virDomainDeviceDefFree(dev); - virObjectUnref(caps); qemuMonitorTestFree(test_mon); return ((ret < 0 && fail) || (!ret && !fail)) ? 0 : -1; } @@ -555,7 +554,7 @@ testQemuHotplugCpuIndividual(const void *opaque) { const struct testQemuHotplugCpuParams *params =3D opaque; struct testQemuHotplugCpuData *data =3D NULL; - virBitmapPtr map =3D NULL; + g_autoptr(virBitmap) map =3D NULL; int ret =3D -1; int rc; =20 @@ -584,7 +583,6 @@ testQemuHotplugCpuIndividual(const void *opaque) ret =3D testQemuHotplugCpuFinalize(data); =20 cleanup: - virBitmapFree(map); testQemuHotplugCpuDataFree(data); return ret; } diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 0867e3a255..68e446ba7b 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -30,7 +30,7 @@ static int testCompareMemLock(const void *data) { const struct testInfo *info =3D data; - virDomainDefPtr def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; g_autofree char *xml =3D NULL; int ret =3D -1; =20 @@ -45,7 +45,6 @@ testCompareMemLock(const void *data) ret =3D virTestCompareToULL(info->memlock, qemuDomainGetMemLockLimitBy= tes(def, false)); =20 cleanup: - virDomainDefFree(def); =20 return ret; } @@ -57,7 +56,7 @@ mymain(void) { int ret =3D 0; g_autofree char *fakerootdir =3D NULL; - virQEMUCapsPtr qemuCaps =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; =20 fakerootdir =3D g_strdup(FAKEROOTDIRTEMPLATE); =20 @@ -145,8 +144,6 @@ mymain(void) DO_TEST("pseries-locked+hostdev", VIR_DOMAIN_MEMORY_PARAM_UNLIMITED); =20 cleanup: - virObjectUnref(qemuCaps); - if (getenv("LIBVIRT_SKIP_CLEANUP") =3D=3D NULL) virFileDeleteTree(fakerootdir); =20 diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index f4357e0f53..e6e6bf7138 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -60,9 +60,9 @@ qemuMigParamsTestXML2XML(const void *opaque) const qemuMigParamsData *data =3D opaque; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; g_autofree char *xmlFile =3D NULL; - xmlDocPtr doc =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; - qemuMigrationParamsPtr migParams =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; + g_autoptr(qemuMigrationParams) migParams =3D NULL; g_autofree char *actualXML =3D NULL; int ret =3D -1; =20 @@ -86,9 +86,6 @@ qemuMigParamsTestXML2XML(const void *opaque) ret =3D 0; =20 cleanup: - qemuMigrationParamsFree(migParams); - xmlXPathFreeContext(ctxt); - xmlFreeDoc(doc); return ret; } =20 @@ -101,8 +98,8 @@ qemuMigParamsTestXML(const void *opaque) g_autofree char *replyFile =3D NULL; g_autofree char *xmlFile =3D NULL; qemuMonitorTestPtr mon =3D NULL; - virJSONValuePtr params =3D NULL; - qemuMigrationParamsPtr migParams =3D NULL; + g_autoptr(virJSONValue) params =3D NULL; + g_autoptr(qemuMigrationParams) migParams =3D NULL; g_autofree char *actualXML =3D NULL; int ret =3D -1; =20 @@ -132,8 +129,6 @@ qemuMigParamsTestXML(const void *opaque) ret =3D 0; =20 cleanup: - virJSONValueFree(params); - qemuMigrationParamsFree(migParams); qemuMonitorTestFree(mon); return ret; } @@ -146,9 +141,9 @@ qemuMigParamsTestJSON(const void *opaque) g_autofree char *replyFile =3D NULL; g_autofree char *jsonFile =3D NULL; qemuMonitorTestPtr mon =3D NULL; - virJSONValuePtr paramsIn =3D NULL; - virJSONValuePtr paramsOut =3D NULL; - qemuMigrationParamsPtr migParams =3D NULL; + g_autoptr(virJSONValue) paramsIn =3D NULL; + g_autoptr(virJSONValue) paramsOut =3D NULL; + g_autoptr(qemuMigrationParams) migParams =3D NULL; g_autofree char *actualJSON =3D NULL; int ret =3D -1; =20 @@ -177,9 +172,6 @@ qemuMigParamsTestJSON(const void *opaque) ret =3D 0; =20 cleanup: - virJSONValueFree(paramsIn); - virJSONValueFree(paramsOut); - qemuMigrationParamsFree(migParams); qemuMonitorTestFree(mon); return ret; } diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 08e90757b1..7fa5ad6a9a 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -720,7 +720,7 @@ qemuMonitorTestProcessGuestAgentSync(qemuMonitorTestPtr= test, qemuMonitorTestItemPtr item G_GNUC_UN= USED, const char *cmdstr) { - virJSONValuePtr val =3D NULL; + g_autoptr(virJSONValue) val =3D NULL; virJSONValuePtr args; unsigned long long id; const char *cmdname; @@ -756,7 +756,6 @@ qemuMonitorTestProcessGuestAgentSync(qemuMonitorTestPtr= test, ret =3D qemuMonitorTestAddResponse(test, retmsg); =20 cleanup: - virJSONValueFree(val); return ret; } =20 @@ -783,7 +782,7 @@ qemuMonitorTestProcessCommandWithArgs(qemuMonitorTestPt= r test, const char *cmdstr) { struct qemuMonitorTestHandlerData *data =3D item->opaque; - virJSONValuePtr val =3D NULL; + g_autoptr(virJSONValue) val =3D NULL; virJSONValuePtr args; virJSONValuePtr argobj; const char *cmdname; @@ -841,7 +840,6 @@ qemuMonitorTestProcessCommandWithArgs(qemuMonitorTestPt= r test, ret =3D qemuMonitorTestAddResponse(test, data->response); =20 cleanup: - virJSONValueFree(val); return ret; } =20 @@ -905,7 +903,7 @@ qemuMonitorTestProcessCommandWithArgStr(qemuMonitorTest= Ptr test, const char *cmdstr) { struct qemuMonitorTestHandlerData *data =3D item->opaque; - virJSONValuePtr val =3D NULL; + g_autoptr(virJSONValue) val =3D NULL; virJSONValuePtr args; g_autofree char *argstr =3D NULL; const char *cmdname; @@ -946,7 +944,6 @@ qemuMonitorTestProcessCommandWithArgStr(qemuMonitorTest= Ptr test, ret =3D qemuMonitorTestAddResponse(test, data->response); =20 cleanup: - virJSONValueFree(val); return ret; } =20 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9388f7bf39..f26de13df1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -565,9 +565,9 @@ testCompareXMLToArgv(const void *data) int ret =3D -1; virDomainObjPtr vm =3D NULL; virDomainChrSourceDef monitor_chr; - virConnectPtr conn; + g_autoptr(virConnect) conn =3D NULL; char *log =3D NULL; - virCommandPtr cmd =3D NULL; + g_autoptr(virCommand) cmd =3D NULL; qemuDomainObjPrivatePtr priv =3D NULL; =20 if (info->arch !=3D VIR_ARCH_NONE && info->arch !=3D VIR_ARCH_X86_64) @@ -688,11 +688,9 @@ testCompareXMLToArgv(const void *data) cleanup: VIR_FREE(log); virDomainChrSourceDefClear(&monitor_chr); - virCommandFree(cmd); virObjectUnref(vm); virSetConnectSecret(NULL); virSetConnectStorage(NULL); - virObjectUnref(conn); if (info->arch !=3D VIR_ARCH_NONE && info->arch !=3D VIR_ARCH_X86_64) qemuTestSetHostArch(&driver, VIR_ARCH_NONE); =20 @@ -716,7 +714,7 @@ mymain(void) { int ret =3D 0; g_autofree char *fakerootdir =3D NULL; - virHashTablePtr capslatest =3D NULL; + g_autoptr(virHashTable) capslatest =3D NULL; =20 fakerootdir =3D g_strdup(FAKEROOTDIRTEMPLATE); =20 @@ -3362,7 +3360,6 @@ mymain(void) =20 VIR_FREE(driver.config->nbdTLSx509certdir); qemuTestDriverFree(&driver); - virHashFree(capslatest); virFileWrapperClearPrefixes(); =20 return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index ccb810ee08..579dac4d6a 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -133,7 +133,7 @@ mymain(void) int ret =3D 0; g_autofree char *fakerootdir =3D NULL; virQEMUDriverConfigPtr cfg =3D NULL; - virHashTablePtr capslatest =3D NULL; + g_autoptr(virHashTable) capslatest =3D NULL; g_autoptr(virConnect) conn =3D NULL; =20 capslatest =3D testQemuGetLatestCaps(); @@ -1498,7 +1498,6 @@ mymain(void) if (getenv("LIBVIRT_SKIP_CLEANUP") =3D=3D NULL) virFileDeleteTree(fakerootdir); =20 - virHashFree(capslatest); qemuTestDriverFree(&driver); virFileWrapperClearPrefixes(); =20 --=20 2.26.2 From nobody Fri Apr 19 14:20:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 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=1595979823; cv=none; d=zohomail.com; s=zohoarc; b=VBRY/Yc/cf/Pi4NVLfzi8KNdqmwh0AGjBxGvl7i4sfgIiRkpafe9DpKOdQD/CXVIAaOTsq31cK3eqmAJj9FMg3ksjAeG3syAyKb6STD7TS/0xIFWd+rBtO0AH1lbiBFc0jT6YBvBw+BCN5V75S4YuJzol0sezRBeuVzFb/E1JE0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595979823; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jtL6iDEnXPmRn31fcaUim32hSr9WrMH2XJ4GxAxInYY=; b=n2QNuq80bPccnmI/JBlBFWltferec+7xp93kGdzXk5F59Q5GcHFbQdts6k3oxbuqsusD/2kbO2p7GApVRvGw7xJevdwuoWMTAmerQ01TQvveaIETBMFbmi5MM4sKwff/kRn9yBtYtOgzW62IbGYCuW8hRWmOL391xaW+a3nSjGM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 1595979823961618.4787230267451; Tue, 28 Jul 2020 16:43:43 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-443-6-wRzfNOPz6PRCMpymOqgA-1; Tue, 28 Jul 2020 19:43:39 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7EE24100A8C4; Tue, 28 Jul 2020 23:43:33 +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 5FE33712F9; Tue, 28 Jul 2020 23:43: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 2E3671809563; Tue, 28 Jul 2020 23:43:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06SNhWD5004310 for ; Tue, 28 Jul 2020 19:43:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7B65810013C4; Tue, 28 Jul 2020 23:43:32 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE0FC100238C for ; Tue, 28 Jul 2020 23:43:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595979822; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=jtL6iDEnXPmRn31fcaUim32hSr9WrMH2XJ4GxAxInYY=; b=Z8rLZ/f5teNkGp6tm5WlrThaH/jpSM629cmVZT1OgBiSsTyV0J0WscSIglQSEsq3Z4Ixuz gwF7CNoKYEkdm7MiCIv6x7cKJqgQN6JrXi7xjBmL6lpExWC3rT1zNJI6DMsPrLycb8S/dg KJuczB98cXQf4tnwyhElXI0xZrO3kXg= X-MC-Unique: 6-wRzfNOPz6PRCMpymOqgA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 5/6] tests: qemu: use VIR_AUTOSTRINGLIST where possible Date: Wed, 29 Jul 2020 01:43:20 +0200 Message-Id: <37090c25eb901341932b5489e76a34cfe2077136.1595979782.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- tests/qemuxml2argvtest.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f26de13df1..ecf6562e90 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -130,7 +130,7 @@ static virStorageVolPtr fakeStorageVolLookupByName(virStoragePoolPtr pool, const char *name) { - char **volinfo =3D NULL; + VIR_AUTOSTRINGLIST volinfo =3D NULL; virStorageVolPtr ret =3D NULL; =20 if (STREQ(pool->name, "inactive")) { @@ -158,7 +158,6 @@ fakeStorageVolLookupByName(virStoragePoolPtr pool, NULL, NULL); =20 cleanup: - virStringListFree(volinfo); return ret; =20 fallback: --=20 2.26.2 From nobody Fri Apr 19 14:20:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 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=1595979830; cv=none; d=zohomail.com; s=zohoarc; b=fOTBPgrsTJaig/MohvfvyBAO21tNc2G605x+QK6/ALlQOWTZUTaHoM8PbjQsdtCvekKi5MxkymJpfXH21VMbNGGIkkGlPTior7C1kynFUGmJ8V0b3Px2Z0h/aFIQCuwOFKD7zqXWo31uV67UJCRkUJxn+1PDFOkdk1MhKXEqJ9I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595979830; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pC93CCicLFXxvvzc+rjUQB5M+o94bRW+eIyuW1lIvPM=; b=Sp1hMrcWWWcHDBxiaVjsAXjPP530ZIyYVSA0WWKn6CG9tmY+c3xiTx6wEXEBGfh/dGDJaJ+mYAs0UYo54ZZZkDCxhuLw9ejlpd0G0bBQ104od5c315cVrTi/vFweBcKLeR3KRVDLpKhLIkBKCe0ted3f6vzBbIcVnNpKi8i2/Co= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 1595979830051447.9526344108592; Tue, 28 Jul 2020 16:43:50 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-153-hjl0g0Q-MXmqxCQ2gdCMUw-1; Tue, 28 Jul 2020 19:43:46 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1863519067E8; Tue, 28 Jul 2020 23:43:41 +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 E9D21100238C; Tue, 28 Jul 2020 23:43:40 +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 B74E6A35A3; Tue, 28 Jul 2020 23:43:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06SNhXNJ004319 for ; Tue, 28 Jul 2020 19:43:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9D62810098A6; Tue, 28 Jul 2020 23:43:33 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED4201001B2C for ; Tue, 28 Jul 2020 23:43:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595979828; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=pC93CCicLFXxvvzc+rjUQB5M+o94bRW+eIyuW1lIvPM=; b=DueclkJ91T/NFNxjk4F158A7KmyTugpMO2k0qBQ0sGLWIYCkdc6zLBVwGNWJ5Xo765yJ0M Sr+D8sZq61RHMKS1h1rYEMqW8Hx4nZzmZdapf5fSu08TYiFoT5rROTBumX/zhYCeqfQzHs JeJ4TEMACNK2tsMRnVtUKb+fxcPISNM= X-MC-Unique: hjl0g0Q-MXmqxCQ2gdCMUw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 6/6] tests: qemu: remove unnecessary labels Date: Wed, 29 Jul 2020 01:43:21 +0200 Message-Id: <47d2a015c632937e76879027585b7ee0d63c9089.1595979782.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- tests/qemucapabilitiestest.c | 14 ++++------- tests/qemucaps2xmltest.c | 13 ++++------ tests/qemudomainsnapshotxml2xmltest.c | 20 +++++++--------- tests/qemuhotplugtest.c | 14 ++++------- tests/qemumemlocktest.c | 9 ++----- tests/qemumigparamstest.c | 14 ++++------- tests/qemumonitortestutils.c | 34 ++++++++++----------------- 7 files changed, 43 insertions(+), 75 deletions(-) diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 81f29c6493..82309b44bb 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -141,7 +141,6 @@ testQemuCaps(const void *opaque) static int testQemuCapsCopy(const void *opaque) { - int ret =3D -1; const testQemuData *data =3D opaque; g_autofree char *capsFile =3D NULL; g_autoptr(virQEMUCaps) orig =3D NULL; @@ -154,21 +153,18 @@ testQemuCapsCopy(const void *opaque) =20 if (!(orig =3D qemuTestParseCapabilitiesArch( virArchFromString(data->archName), capsFile))) - goto cleanup; + return -1; =20 if (!(copy =3D virQEMUCapsNewCopy(orig))) - goto cleanup; + return -1; =20 if (!(actual =3D virQEMUCapsFormatCache(copy))) - goto cleanup; + return -1; =20 if (virTestCompareToFile(actual, capsFile) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 5316a221ff..af4c96cb69 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -129,7 +129,6 @@ testGetCaps(char *capsData, const testQemuData *data) static int testQemuCapsXML(const void *opaque) { - int ret =3D -1; const testQemuData *data =3D opaque; g_autofree char *capsFile =3D NULL; g_autofree char *xmlFile =3D NULL; @@ -144,21 +143,19 @@ testQemuCapsXML(const void *opaque) data->archName, data->suffix); =20 if (virTestLoadFile(capsFile, &capsData) < 0) - goto cleanup; + return -1; =20 if (!(capsProvided =3D testGetCaps(capsData, data))) - goto cleanup; + return -1; =20 capsXml =3D virCapabilitiesFormatXML(capsProvided); if (!capsXml) - goto cleanup; + return -1; =20 if (virTestCompareToFile(capsXml, xmlFile) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapsh= otxml2xmltest.c index 6c10f3e953..4b92967339 100644 --- a/tests/qemudomainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -34,7 +34,6 @@ testCompareXMLToXMLFiles(const char *inxml, g_autofree char *inXmlData =3D NULL; g_autofree char *outXmlData =3D NULL; g_autofree char *actual =3D NULL; - int ret =3D -1; unsigned int parseflags =3D VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; unsigned int formatflags =3D VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE; bool cur =3D false; @@ -49,40 +48,37 @@ testCompareXMLToXMLFiles(const char *inxml, parseflags |=3D VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE; =20 if (virTestLoadFile(inxml, &inXmlData) < 0) - goto cleanup; + return -1; =20 if (virTestLoadFile(outxml, &outXmlData) < 0) - goto cleanup; + return -1; =20 if (!(def =3D virDomainSnapshotDefParseString(inXmlData, driver.xmlopt, NULL, &cur, parseflags))) - goto cleanup; + return -1; if (cur) { if (!(flags & TEST_INTERNAL)) - goto cleanup; + return -1; formatflags |=3D VIR_DOMAIN_SNAPSHOT_FORMAT_CURRENT; } if (flags & TEST_RUNNING) { if (def->state) - goto cleanup; + return -1; def->state =3D VIR_DOMAIN_RUNNING; } =20 if (!(actual =3D virDomainSnapshotDefFormat(uuid, def, driver.xmlopt, formatflags))) - goto cleanup; + return -1; =20 if (STRNEQ(outXmlData, actual)) { virTestDifferenceFull(stderr, outXmlData, outxml, actual, inxml); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 struct testInfo { diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index ba644abe8a..1e18820a2b 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -472,33 +472,29 @@ testQemuHotplugCpuPrepare(const char *test, static int testQemuHotplugCpuFinalize(struct testQemuHotplugCpuData *data) { - int ret =3D -1; g_autofree char *activeXML =3D NULL; g_autofree char *configXML =3D NULL; =20 if (data->file_xml_res_live) { if (!(activeXML =3D virDomainDefFormat(data->vm->def, driver.xmlop= t, VIR_DOMAIN_DEF_FORMAT_SECURE)= )) - goto cleanup; + return -1; =20 if (virTestCompareToFile(activeXML, data->file_xml_res_live) < 0) - goto cleanup; + return -1; } =20 if (data->file_xml_res_conf) { if (!(configXML =3D virDomainDefFormat(data->vm->newDef, driver.xm= lopt, VIR_DOMAIN_DEF_FORMAT_SECURE | VIR_DOMAIN_DEF_FORMAT_INACTIV= E))) - goto cleanup; + return -1; =20 if (virTestCompareToFile(configXML, data->file_xml_res_conf) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 68e446ba7b..86057e9a3a 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -32,21 +32,16 @@ testCompareMemLock(const void *data) const struct testInfo *info =3D data; g_autoptr(virDomainDef) def =3D NULL; g_autofree char *xml =3D NULL; - int ret =3D -1; =20 xml =3D g_strdup_printf("%s/qemumemlockdata/qemumemlock-%s.xml", abs_s= rcdir, info->name); =20 if (!(def =3D virDomainDefParseFile(xml, driver.xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) { - goto cleanup; + return -1; } =20 - ret =3D virTestCompareToULL(info->memlock, qemuDomainGetMemLockLimitBy= tes(def, false)); - - cleanup: - - return ret; + return virTestCompareToULL(info->memlock, qemuDomainGetMemLockLimitByt= es(def, false)); } =20 # define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index e6e6bf7138..0f7809d763 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -64,29 +64,25 @@ qemuMigParamsTestXML2XML(const void *opaque) g_autoptr(xmlXPathContext) ctxt =3D NULL; g_autoptr(qemuMigrationParams) migParams =3D NULL; g_autofree char *actualXML =3D NULL; - int ret =3D -1; =20 xmlFile =3D g_strdup_printf("%s/qemumigparamsdata/%s.xml", abs_srcdir, data->name); =20 if (!(doc =3D virXMLParseFileCtxt(xmlFile, &ctxt))) - goto cleanup; + return -1; =20 if (qemuMigrationParamsParse(ctxt, &migParams) < 0) - goto cleanup; + return -1; =20 qemuMigParamsTestFormatXML(&buf, migParams); =20 if (!(actualXML =3D virBufferContentAndReset(&buf))) - goto cleanup; + return -1; =20 if (virTestCompareToFile(actualXML, xmlFile) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 7fa5ad6a9a..d74df15966 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -787,26 +787,25 @@ qemuMonitorTestProcessCommandWithArgs(qemuMonitorTest= Ptr test, virJSONValuePtr argobj; const char *cmdname; size_t i; - int ret =3D -1; =20 if (!(val =3D virJSONValueFromString(cmdstr))) return -1; =20 if (!(cmdname =3D virJSONValueObjectGetString(val, "execute"))) { qemuMonitorTestError("Missing command name in %s", cmdstr); - goto cleanup; + return -1; } =20 if (data->command_name && STRNEQ(data->command_name, cmdname)) { qemuMonitorTestErrorInvalidCommand(data->command_name, cmdname); - goto cleanup; + return -1; } =20 if (!(args =3D virJSONValueObjectGet(val, "arguments"))) { qemuMonitorTestError("Missing arguments section for command '%s'", NULLSTR(data->command_name)); - goto cleanup; + return -1; } =20 /* validate the args */ @@ -818,12 +817,12 @@ qemuMonitorTestProcessCommandWithArgs(qemuMonitorTest= Ptr test, qemuMonitorTestError("Missing argument '%s' for command '%s'", arg->argname, NULLSTR(data->command_name)); - goto cleanup; + return -1; } =20 /* convert the argument to string */ if (!(argstr =3D virJSONValueToString(argobj, false))) - goto cleanup; + return -1; =20 /* verify that the argument value is expected */ if (STRNEQ(argstr, arg->argval)) { @@ -832,15 +831,12 @@ qemuMonitorTestProcessCommandWithArgs(qemuMonitorTest= Ptr test, arg->argname, NULLSTR(data->command_name), arg->argval, argstr); - goto cleanup; + return -1; } } =20 /* arguments checked out, return the response */ - ret =3D qemuMonitorTestAddResponse(test, data->response); - - cleanup: - return ret; + return qemuMonitorTestAddResponse(test, data->response); } =20 =20 @@ -907,44 +903,40 @@ qemuMonitorTestProcessCommandWithArgStr(qemuMonitorTe= stPtr test, virJSONValuePtr args; g_autofree char *argstr =3D NULL; const char *cmdname; - int ret =3D -1; =20 if (!(val =3D virJSONValueFromString(cmdstr))) return -1; =20 if (!(cmdname =3D virJSONValueObjectGetString(val, "execute"))) { qemuMonitorTestError("Missing command name in %s", cmdstr); - goto cleanup; + return -1; } =20 if (STRNEQ(data->command_name, cmdname)) { qemuMonitorTestErrorInvalidCommand(data->command_name, cmdname); - goto cleanup; + return -1; } =20 if (!(args =3D virJSONValueObjectGet(val, "arguments"))) { qemuMonitorTestError("Missing arguments section for command '%s'", data->command_name); - goto cleanup; + return -1; } =20 /* convert the arguments to string */ if (!(argstr =3D virJSONValueToString(args, false))) - goto cleanup; + return -1; =20 /* verify that the argument value is expected */ if (STRNEQ(argstr, data->expectArgs)) { qemuMonitorTestError("%s: expected arguments: '%s', got: '%s'", data->command_name, data->expectArgs, argstr); - goto cleanup; + return -1; } =20 /* arguments checked out, return the response */ - ret =3D qemuMonitorTestAddResponse(test, data->response); - - cleanup: - return ret; + return qemuMonitorTestAddResponse(test, data->response); } =20 =20 --=20 2.26.2