From nobody Sun Feb 8 19:39:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578347922; cv=none; d=zohomail.com; s=zohoarc; b=FEa7SHCmTiErZjpNmDCcVR2dymE0ZAcykj05ud/deOqfVMj9Jo0L2ojh9+0aXluD+pEwnw8CiWyIeAPVJMnmgboLtsgo3reT+sDeqQdzWy/T2T5aRF4hD/tqNo1dPj7PjXo8XHAZNm7+TYJzxQ1h2pOOxb9KmWluX1rvJvO3ick= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578347922; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aJdhhLb4Gsdo7hZGUwJFWjDIs96hQ/en14hZzROeVdc=; b=fvuDEJkdwcYRphiqukvvPhT35iCyAatl0jLcCLmCNhOwsQiSD0zgUBh5wCGYQjU5UtN1tcu7cy9L/NDBKzFYUsxFgw+izRCLA53aPEOuY/bESu+xi3s72/8ayDhe2uwywoc0uEcj3x+D2JS6BPhsGFLX86wH+NNpwaJzuhtweaE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1578347922619181.50598705711184; Mon, 6 Jan 2020 13:58:42 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-384-_hmnYaC4M7yCde4F7C8ecA-1; Mon, 06 Jan 2020 16:58:38 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 56AD6107ACE6; Mon, 6 Jan 2020 21:58: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 2F0BC1084199; Mon, 6 Jan 2020 21:58:31 +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 E3AD118089CE; Mon, 6 Jan 2020 21:58:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 006Lw8O8007179 for ; Mon, 6 Jan 2020 16:58:08 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2B85A2166B2A; Mon, 6 Jan 2020 21:58:08 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 26F6A2166B29 for ; Mon, 6 Jan 2020 21:58:08 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 08E2C802085 for ; Mon, 6 Jan 2020 21:58:08 +0000 (UTC) Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-242-POA1CUGVOpKPzFnt9Z23EQ-1; Mon, 06 Jan 2020 16:58:05 -0500 Received: by mail-qt1-f175.google.com with SMTP id t3so43694310qtr.11 for ; Mon, 06 Jan 2020 13:58:05 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c6:655b:9e1c:e865:3705:e1df]) by smtp.gmail.com with ESMTPSA id x34sm23898440qtd.20.2020.01.06.13.58.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 13:58:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578347921; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=aJdhhLb4Gsdo7hZGUwJFWjDIs96hQ/en14hZzROeVdc=; b=Nqtke9ONfM+3xbJo8FdZdnDHDAj0QLLeT5Y1IvblvWwg/8/7hcqlmFsaq1Vc8OQp7ruAVI XY+IoelG12KeRPBjRH5gUopKvjqnqbsg1sjPxSGhPRS+ONpN/cVg6N/p522wtBpZdf8SDd OCfArflZaCoxxCFq+GneQl3ZtIwg7nU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l1w84g05g55WhLgLf2fRyWlJJtTfhJbwM1YuPrb9Ll4=; b=EHoWLsHO/2cjU2mdyqcAYWH9ncbv9ljOe4tLMd2CBQnjZesLf0fbCQTzVrKJrTzT5H gPF3x2+wbCp7y9OThmtTuD1RIUeP8cSrxqv3jRvftmPHZ1CXb0qxWGLCAWXE2+mIeRyi FXlaBpzus9a2zxqyRUeN9kDvQXBGSlV3w9AeGwUFJmSfp/JZaS+4IeMyQzd+DlZe+Ic4 xSIjEFVqoC0gL5N6IUyqLmGfpRNV9NNLRaCl0UmiGcY+9TGGmvRWOAzTKuMXACsV2OoX wb/cCl24zvC+vvx31XQmmhYW2E4hXQNvMqv3Oh1IsNn5Voxu0hw8pW0BB+mpz/5A0qUN uqWQ== X-Gm-Message-State: APjAAAWyn99i5Y/4bnYlAxF39HrBm/QDcGO7VKpXz5GJRmM+ceLloeTU zdY221fGseP6ZigtiB2IBihfXE/M X-Google-Smtp-Source: APXvYqyFkO0D2q/A+mU8BshlVu8/P2+/LvDx6gjvCztOCiKamDkXOxfRq+vbC+KBHiEb2rdoo+HoRg== X-Received: by 2002:ac8:2bf8:: with SMTP id n53mr57855097qtn.1.1578347885271; Mon, 06 Jan 2020 13:58:05 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 6 Jan 2020 18:57:29 -0300 Message-Id: <20200106215750.361615-6-danielhb413@gmail.com> In-Reply-To: <20200106215750.361615-1-danielhb413@gmail.com> References: <20200106215750.361615-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: POA1CUGVOpKPzFnt9Z23EQ-1 X-MC-Unique: _hmnYaC4M7yCde4F7C8ecA-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 006Lw8O8007179 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 05/26] test/test_driver.c: remove unneeded labels X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza --- src/test/test_driver.c | 51 ++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index f8e08dcf07..1908185743 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -791,7 +791,7 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathCont= extPtr ctxt) } else if (ret =3D=3D -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid node cpu nodes value")); - goto error; + return -1; } =20 ret =3D virXPathLong("string(/node/cpu/sockets[1])", ctxt, &l); @@ -800,7 +800,7 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathCont= extPtr ctxt) } else if (ret =3D=3D -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid node cpu sockets value")); - goto error; + return -1; } =20 ret =3D virXPathLong("string(/node/cpu/cores[1])", ctxt, &l); @@ -809,7 +809,7 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathCont= extPtr ctxt) } else if (ret =3D=3D -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid node cpu cores value")); - goto error; + return -1; } =20 ret =3D virXPathLong("string(/node/cpu/threads[1])", ctxt, &l); @@ -818,7 +818,7 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathCont= extPtr ctxt) } else if (ret =3D=3D -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid node cpu threads value")); - goto error; + return -1; } =20 nodeInfo->cpus =3D (nodeInfo->cores * nodeInfo->threads * @@ -830,7 +830,7 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathCont= extPtr ctxt) } else if (ret =3D=3D -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid node cpu active value")); - goto error; + return -1; } ret =3D virXPathLong("string(/node/cpu/mhz[1])", ctxt, &l); if (ret =3D=3D 0) { @@ -838,7 +838,7 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathCont= extPtr ctxt) } else if (ret =3D=3D -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid node cpu mhz value")); - goto error; + return -1; } =20 str =3D virXPathString("string(/node/cpu/model[1])", ctxt); @@ -846,7 +846,7 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathCont= extPtr ctxt) if (virStrcpyStatic(nodeInfo->model, str) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Model %s too big for destination"), str); - goto error; + return -1; } } =20 @@ -856,12 +856,10 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathCo= ntextPtr ctxt) } else if (ret =3D=3D -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid node memory value")); - goto error; + return -1; } =20 return 0; - error: - return -1; } =20 static int @@ -871,7 +869,6 @@ testParseDomainSnapshots(testDriverPtr privconn, xmlXPathContextPtr ctxt) { size_t i; - int ret =3D -1; testDomainNamespaceDefPtr nsdata =3D domobj->def->namespaceData; xmlNodePtr *nodes =3D nsdata->snap_nodes; bool cur; @@ -882,7 +879,7 @@ testParseDomainSnapshots(testDriverPtr privconn, xmlNodePtr node =3D testParseXMLDocFromFile(nodes[i], file, "domainsnapshot"); if (!node) - goto error; + return -1; =20 def =3D virDomainSnapshotDefParseNode(ctxt->doc, node, privconn->xmlopt, @@ -892,18 +889,18 @@ testParseDomainSnapshots(testDriverPtr privconn, VIR_DOMAIN_SNAPSHOT_PARSE_INTE= RNAL | VIR_DOMAIN_SNAPSHOT_PARSE_REDE= FINE); if (!def) - goto error; + return -1; =20 if (!(snap =3D virDomainSnapshotAssignDef(domobj->snapshots, def))= ) { virObjectUnref(def); - goto error; + return -1; } =20 if (cur) { if (virDomainSnapshotGetCurrent(domobj->snapshots)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("more than one snapshot claims to be acti= ve")); - goto error; + return -1; } =20 virDomainSnapshotSetCurrent(domobj->snapshots, snap); @@ -914,12 +911,10 @@ testParseDomainSnapshots(testDriverPtr privconn, virReportError(VIR_ERR_INTERNAL_ERROR, _("Snapshots have inconsistent relations for " "domain %s"), domobj->def->name); - goto error; + return -1; } =20 - ret =3D 0; - error: - return ret; + return 0; } =20 static int @@ -1236,27 +1231,25 @@ testOpenParse(testDriverPtr privconn, if (!virXMLNodeNameEqual(ctxt->node, "node")) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Root element is not 'node'")); - goto error; + return -1; } =20 if (testParseNodeInfo(&privconn->nodeInfo, ctxt) < 0) - goto error; + return -1; if (testParseDomains(privconn, file, ctxt) < 0) - goto error; + return -1; if (testParseNetworks(privconn, file, ctxt) < 0) - goto error; + return -1; if (testParseInterfaces(privconn, file, ctxt) < 0) - goto error; + return -1; if (testParseStorage(privconn, file, ctxt) < 0) - goto error; + return -1; if (testParseNodedevs(privconn, file, ctxt) < 0) - goto error; + return -1; if (testParseAuthUsers(privconn, ctxt) < 0) - goto error; + return -1; =20 return 0; - error: - return -1; } =20 /* No shared state between simultaneous test connections initialized --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list