From nobody Sun Feb 8 19:39:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578347947; cv=none; d=zohomail.com; s=zohoarc; b=g4tIRk3uhsbnzeO+65P8ov8k9wRnCcmNItoFMkRMKJx4TZdKnLJP6W05R5ZkAHguQMsPz4L1HF+EaAWb6FVFFks6obqwrzcan5QOx7Ej5rVoFFFANS+HpePwwNfYZqAzu1RcivhnLJ6ljiBYZslEvDvFhbhPywoeLLsmeNa3wJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578347947; 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=GT5JKqe2cPQoCx3VWaArhdkL8W2h8YGVFHcKH5EW1Ak=; b=Sozs6s0rDqdxXlk2h4ap7xwCGzTf/KgcqWirR93nvHloY8fBYfaB5M16k3vp0OmYHHTzRiOg9YEYD4Gcy5JL0yc8Iu9KZ1emu+iUSYEjuQ13X+/311PwDwjIkXCrWblNPNTHlyYS7gAcz91BPOs+SW70Xz69z+BGEahiLT6HAPs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 157834794770447.74496017217746; Mon, 6 Jan 2020 13:59:07 -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-133-ePeR9ne_P36DZzaob1kvww-1; Mon, 06 Jan 2020 16:59:02 -0500 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 3DC30100551B; Mon, 6 Jan 2020 21:58:57 +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 139357BFFA; Mon, 6 Jan 2020 21:58: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 C8CD618034F0; Mon, 6 Jan 2020 21:58:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 006LwS13007332 for ; Mon, 6 Jan 2020 16:58:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 64340101B561; Mon, 6 Jan 2020 21:58:28 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5C60E101B566 for ; Mon, 6 Jan 2020 21:58:26 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9E041101D225 for ; Mon, 6 Jan 2020 21:58:26 +0000 (UTC) Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-178-d1hqxPyGOwCs0RL_eqYFAg-1; Mon, 06 Jan 2020 16:58:24 -0500 Received: by mail-qk1-f182.google.com with SMTP id a203so41256393qkc.3 for ; Mon, 06 Jan 2020 13:58:24 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 13:58:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578347944; 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=GT5JKqe2cPQoCx3VWaArhdkL8W2h8YGVFHcKH5EW1Ak=; b=TVPumj2vhPZimZaWu1MQ7A0az1ULxOUmW1s1hymO74lKJObYt5JTSa2W2/tYkQ6fYubIx4 G8AvXBITwnFZ7GHzCsoBlESLf4SunhjUizUqEIv6bvYJ+RIP08dKetX2G/g+ggrZxwy+DN jSzSXMFXOb4t8xiTUiejFSvr6qrOiY8= 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=c8ciDcr2klM1lq1ky6fE1wWAPg1l2JbQ+FjuSxrA7JE=; b=P2txdiSPeq1iN36uwLY2O2ak2Zx63qwnvFLai6MtH1PY1yBp4/faPb+sm7ROcqxD/0 qpPn5N47e/F9Ed+xRmKN8IxDsn+8r7+U//zWcGDToaOEy+onakVGjLKG2Jm5XL8yLHTl iZN89porW8HmaF8PR/eeguW9ITUFsh0AQlecxwnNLZEJNPh+mvZ5VydZUsE3W8VT0SUu 2G58TSW9ghsWWj581VopJ1yi7a/LsfUsJ3IVP78EkqD5Y1H5H4hgTFteO5vMCIAFdwXy u1RuydywA48BaORex9fMWxD7JzGeA6rUlDrHm8QWsEtoiOtZsVzcTK86thhpaxRC0VND eskQ== X-Gm-Message-State: APjAAAUI8czgvBwJUvQGQnwpmxiU2CoLhr7SvA7w0w4ttjueultriJIU yeJIysJNsRastMe7alSGSHMTFkne X-Google-Smtp-Source: APXvYqyl4i8cqGL3qUNJMEvL7mcnI4Ju/SuwE79274BY7vx57QjLSPyK48wzozpLLcy0hSD7gSHEog== X-Received: by 2002:ae9:e407:: with SMTP id q7mr75147628qkc.160.1578347904177; Mon, 06 Jan 2020 13:58:24 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 6 Jan 2020 18:57:42 -0300 Message-Id: <20200106215750.361615-19-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: d1hqxPyGOwCs0RL_eqYFAg-1 X-MC-Unique: ePeR9ne_P36DZzaob1kvww-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 006LwS13007332 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 18/26] vz/vz_sdk.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.79 on 10.5.11.15 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/vz/vz_sdk.c | 102 ++++++++++++++++++------------------------------ 1 file changed, 37 insertions(+), 65 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index c98542c244..b8ac055574 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1036,16 +1036,15 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNe= tDefPtr net, bool isCt) PRL_UINT32 emulatedType; PRL_RESULT pret; PRL_BOOL isConnected, isMacFilter; - int ret =3D -1; =20 /* use device name, shown by prlctl as target device * for identifying network adapter in virDomainDefineXML */ if (!(net->ifname =3D prlsdkGetStringParamVar(PrlVmDevNet_GetHostInter= faceName, netAdapter))) - goto cleanup; + return -1; =20 pret =3D PrlVmDev_GetIndex(netAdapter, &netAdapterIndex); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); =20 if (isCt && netAdapterIndex =3D=3D (PRL_UINT32) -1) { /* venet devices don't have mac address and @@ -1058,19 +1057,19 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNe= tDefPtr net, bool isCt) =20 pret =3D prlsdkGetStringParamBuf(PrlVmDevNet_GetMacAddressCanonical, netAdapter, macstr, sizeof(macstr)); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); =20 if (virMacAddrParse(macstr, &net->mac) < 0) - goto cleanup; + return -1; =20 if (prlsdkGetNetAddresses(netAdapter, net) < 0) - goto cleanup; + return -1; =20 if (prlsdkGetRoutes(netAdapter, net) < 0) - goto cleanup; + return -1; =20 pret =3D PrlVmDev_GetEmulatedType(netAdapter, &emulatedType); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); =20 if (emulatedType =3D=3D PNA_ROUTED) { net->type =3D VIR_DOMAIN_NET_TYPE_NETWORK; @@ -1094,7 +1093,7 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetD= efPtr net, bool isCt) if (!isCt) { PRL_VM_NET_ADAPTER_TYPE type; pret =3D PrlVmDevNet_GetAdapterType(netAdapter, &type); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); =20 switch ((int)type) { case PNT_RTL: @@ -1109,12 +1108,12 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNe= tDefPtr net, bool isCt) default: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown adapter type: %X"), type); - goto cleanup; + return -1; } } =20 pret =3D PrlVmDev_IsConnected(netAdapter, &isConnected); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); =20 if (isConnected) net->linkstate =3D VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP; @@ -1122,14 +1121,12 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNe= tDefPtr net, bool isCt) net->linkstate =3D VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN; =20 pret =3D PrlVmDevNet_IsPktFilterPreventMacSpoof(netAdapter, &isMacFilt= er); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); =20 net->trustGuestRxFilters =3D isMacFilter ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int @@ -1296,29 +1293,27 @@ prlsdkAddDomainHardware(vzDriverPtr driver, { if (IS_CT(def)) { if (prlsdkAddDomainVideoInfoCt(def, xmlopt) < 0) - goto error; + return -1; } else { if (prlsdkAddDomainVideoInfoVm(sdkdom, def) < 0) - goto error; + return -1; } =20 if (prlsdkAddDomainHardDisksInfo(driver, sdkdom, def) < 0) - goto error; + return -1; =20 if (prlsdkAddDomainOpticalDisksInfo(driver, sdkdom, def) < 0) - goto error; + return -1; =20 if (prlsdkAddDomainNetInfo(sdkdom, def) < 0) - goto error; + return -1; =20 if (prlsdkAddSerialInfo(sdkdom, &def->serials, &def->nserials) < 0) - goto error; + return -1; =20 return 0; - error: - return -1; } =20 =20 @@ -1507,7 +1502,7 @@ prlsdkConvertDomainType(PRL_HANDLE sdkdom, virDomainD= efPtr def) PRL_RESULT pret; =20 pret =3D PrlVmCfg_GetVmType(sdkdom, &domainType); - prlsdkCheckRetGoto(pret, error); + prlsdkCheckRetExit(pret, -1); =20 switch (domainType) { case PVT_VM: @@ -1524,9 +1519,6 @@ prlsdkConvertDomainType(PRL_HANDLE sdkdom, virDomainD= efPtr def) } =20 return 0; - - error: - return -1; } =20 static int @@ -1536,7 +1528,7 @@ prlsdkConvertCpuMode(PRL_HANDLE sdkdom, virDomainDefP= tr def) PRL_CPU_MODE cpuMode; =20 pret =3D PrlVmCfg_GetCpuMode(sdkdom, &cpuMode); - prlsdkCheckRetGoto(pret, error); + prlsdkCheckRetExit(pret, -1); =20 switch (cpuMode) { case PCM_CPU_MODE_32: @@ -1552,8 +1544,6 @@ prlsdkConvertCpuMode(PRL_HANDLE sdkdom, virDomainDefP= tr def) } =20 return 0; - error: - return -1; } =20 static PRL_HANDLE @@ -2741,19 +2731,16 @@ prlsdkRemoveBootDevices(PRL_HANDLE sdkdom) =20 /* always get device by index 0, because device list resort after = delete */ pret =3D PrlVmCfg_GetBootDev(sdkdom, 0, &dev); - prlsdkCheckRetGoto(pret, error); + prlsdkCheckRetExit(pret, -1); =20 pret =3D PrlBootDev_GetType(dev, &devType); - prlsdkCheckRetGoto(pret, error); + prlsdkCheckRetExit(pret, -1); =20 pret =3D PrlBootDev_Remove(dev); - prlsdkCheckRetGoto(pret, error); + prlsdkCheckRetExit(pret, -1); } =20 return 0; - - error: - return -1; } =20 static int @@ -3039,7 +3026,6 @@ static int prlsdkApplyGraphicsParams(PRL_HANDLE sdkdo= m, { virDomainGraphicsListenDefPtr glisten; PRL_RESULT pret; - int ret =3D -1; =20 if (!gr) { pret =3D PrlVmCfg_SetVNCMode(sdkdom, PRD_DISABLED); @@ -3052,23 +3038,21 @@ static int prlsdkApplyGraphicsParams(PRL_HANDLE sdk= dom, =20 if (gr->data.vnc.autoport) { pret =3D PrlVmCfg_SetVNCMode(sdkdom, PRD_AUTO); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); } else { pret =3D PrlVmCfg_SetVNCMode(sdkdom, PRD_MANUAL); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); =20 pret =3D PrlVmCfg_SetVNCPort(sdkdom, gr->data.vnc.port); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); } =20 glisten =3D virDomainGraphicsGetListen(gr, 0); pret =3D PrlVmCfg_SetVNCHostName(sdkdom, glisten && glisten->address ? glisten->address : VIR_LOOPBACK= _IPV4_ADDR); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int prlsdkApplyVideoParams(PRL_HANDLE sdkdom G_GNUC_UNUSED, virDoma= inDefPtr def) @@ -3087,11 +3071,9 @@ static int prlsdkApplyVideoParams(PRL_HANDLE sdkdom = G_GNUC_UNUSED, virDomainDefP return -1; =20 pret =3D PrlVmCfg_SetVideoRamSize(sdkdom, def->videos[0]->vram >> 10); - prlsdkCheckRetGoto(pret, error); + prlsdkCheckRetExit(pret, -1); =20 return 0; - error: - return -1; } =20 static int prlsdkAddSerial(PRL_HANDLE sdkdom, virDomainChrDefPtr chr) @@ -4524,13 +4506,12 @@ prlsdkGetMemoryStats(PRL_HANDLE sdkstats, virDomainMemoryStatPtr stats, unsigned int nr_stats) { - int ret =3D -1; long long v =3D 0, t =3D 0, u =3D 0; size_t i =3D 0; =20 #define PRLSDK_GET_COUNTER(NAME, VALUE) \ if (prlsdkExtractStatsParam(sdkstats, NAME, &VALUE) < 0) \ - goto cleanup; \ + return -1; \ =20 #define PRLSDK_MEMORY_STAT_SET(TAG, VALUE) \ if (i < nr_stats) { \ @@ -4574,10 +4555,7 @@ prlsdkGetMemoryStats(PRL_HANDLE sdkstats, #undef PRLSDK_GET_COUNTER #undef PRLSDK_MEMORY_STAT_SET =20 - ret =3D i; - cleanup: - - return ret; + return i; } =20 /* memsize is in MiB */ @@ -4589,19 +4567,16 @@ int prlsdkSetMemsize(virDomainObjPtr dom, unsigned = int memsize) =20 job =3D PrlVm_BeginEdit(privdom->sdkdom); if (PRL_FAILED(waitDomainJob(job, dom))) - goto error; + return -1; =20 pret =3D PrlVmCfg_SetRamSize(privdom->sdkdom, memsize); - prlsdkCheckRetGoto(pret, error); + prlsdkCheckRetExit(pret, -1); =20 job =3D PrlVm_CommitEx(privdom->sdkdom, 0); if (PRL_FAILED(waitDomainJob(job, dom))) - goto error; + return -1; =20 return 0; - - error: - return -1; } =20 static long long @@ -4861,19 +4836,16 @@ int prlsdkSetCpuCount(virDomainObjPtr dom, unsigned= int count) =20 job =3D PrlVm_BeginEdit(privdom->sdkdom); if (PRL_FAILED(waitDomainJob(job, dom))) - goto error; + return -1; =20 pret =3D PrlVmCfg_SetCpuCount(privdom->sdkdom, count); - prlsdkCheckRetGoto(pret, error); + prlsdkCheckRetExit(pret, -1); =20 job =3D PrlVm_CommitEx(privdom->sdkdom, 0); if (PRL_FAILED(waitDomainJob(job, dom))) - goto error; + return -1; =20 return 0; - - error: - return -1; } =20 int prlsdkResizeImage(virDomainObjPtr dom, virDomainDiskDefPtr disk, --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list