From nobody Sun Feb 8 19:54:57 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=1578347902; cv=none; d=zohomail.com; s=zohoarc; b=fpQfLFum1K1MFSQ/CBVdFC09Vn3vQam2jbUuyZmY4+nUgxXqvPGsB7GFkJ7WGU5sxxQPAnQtFGoD4/95abSRqaqxcxPJWb2ogNXuurAtmcHbrwcBNMd/KcF67F8ekfzOBtQFGhDFhb1DOiYm+8KGWZw2atptqVJZGovQC3jNYYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578347902; 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=qkNo0T/XQv5EL5Q2oXUkI7P6+WeX1qWdYPaZmPuwISY=; b=dKAq6kPF3pebCX57YjOKiGlsiq9OtHhrq2smky0NPgmgeKqbVD23A+ff3/xfzFgbrRBeD+uYyccpXvcPsJkhOr52+uiXbjE7/SQ5GLYXltWeqk1MdskLd4Jn5S0YJdwlFC4m3WOLQGlegDPM2nKJ8GWBCED0076V9TAbTDMNUoA= 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 157834790250642.88538856737398; Mon, 6 Jan 2020 13:58:22 -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-77-E3y3qF1zNsSfSk_QS3aTPg-1; Mon, 06 Jan 2020 16:58:18 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2EC44801E77; Mon, 6 Jan 2020 21:58:12 +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 88E3360E1C; Mon, 6 Jan 2020 21:58:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 03DAA18089C8; Mon, 6 Jan 2020 21:58:05 +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 006Lw4se007147 for ; Mon, 6 Jan 2020 16:58:04 -0500 Received: by smtp.corp.redhat.com (Postfix) id 31AB42166B2E; Mon, 6 Jan 2020 21:58:04 +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 2CE2D2166B2B for ; Mon, 6 Jan 2020 21:58:01 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BE58D80208A for ; Mon, 6 Jan 2020 21:58:01 +0000 (UTC) Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-28-hkMFy1nFP6SBoOlK7XFFog-1; Mon, 06 Jan 2020 16:58:00 -0500 Received: by mail-qt1-f195.google.com with SMTP id e6so43720765qtq.7 for ; Mon, 06 Jan 2020 13:57:59 -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.57.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 13:57:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578347901; 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=qkNo0T/XQv5EL5Q2oXUkI7P6+WeX1qWdYPaZmPuwISY=; b=i5LJA8G8lwHVvyv3W+tK+ZE630SxcSk8XRwaXuVpvM35Ry416vW/ngPnjjwb0Ft6gG6vs1 +h0Wml9kPQY1d5BkQU/7aPHQLv+K84R3VVCa6ZNnrtlMrSTBV7qFcUFJgXnSLFTM2JEKKU lQeKWpxJrE872/tp0q0vsp+V1wAriwA= 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=K2AXH0WX680Ilo0A5yJ/bfCE9dPwgpq8GaUC39Iy5qY=; b=Y/pBULRrius2X0dr2pMlcCZZdU923TkOi1naxne/Ad5ZBNfr5gc3qSLGzV9BdYYAe8 clrlPltXAYzadkqkKI6ipVRZHuwPY1a8QZGXxk44G/SfqtsMgh8LApd+S12RRx5XafJF K3DW8UFgoHi0KmMFOq01chAzHVgdnywcstL5dEx1s9ay0b0vDRTPz3MqOTKj8q6WTFAd Tu+W8jP/0yH1v5YzveOaLL9SfRlIbWb0S1yh7KlbwHAK6O6CJjT9KAHKlK+oWBQfLoAH Dop1vA6NPELgHnMYCUDUHENCXYSW9xjNDbYQOa7LYKn2eSbJJbIW0A38ViQoVUGutia6 N2iA== X-Gm-Message-State: APjAAAVyPHnFlPOZhRk0je3apI1/X+G1EGMvLF13WFyac9UdpzPbd7A1 LKIFOE0ttXQw4BFy+HuXgHzAMzou X-Google-Smtp-Source: APXvYqyK2gbA8438QqGpuhyf5fPJWNhHGfDRoLSXQ2+7Ax+Xp+R4dnNo31d813cRxazCtXhOugzI0g== X-Received: by 2002:ac8:7201:: with SMTP id a1mr76445253qtp.51.1578347879383; Mon, 06 Jan 2020 13:57:59 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 6 Jan 2020 18:57:25 -0300 Message-Id: <20200106215750.361615-2-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: hkMFy1nFP6SBoOlK7XFFog-1 X-MC-Unique: E3y3qF1zNsSfSk_QS3aTPg-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 006Lw4se007147 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 01/26] bhyve: 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.12 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Labels that are simply a jump to a 'return' call are unneeded and can be replaced by the return value instead. Signed-off-by: Daniel Henrique Barboza --- src/bhyve/bhyve_device.c | 13 ++++----- src/bhyve/bhyve_parse_command.c | 47 +++++++++++++-------------------- 2 files changed, 23 insertions(+), 37 deletions(-) diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c index ddbe20d31d..13261e9935 100644 --- a/src/bhyve/bhyve_device.c +++ b/src/bhyve/bhyve_device.c @@ -97,7 +97,7 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, =20 if (virDomainPCIAddressReserveAddr(addrs, &lpc_addr, VIR_PCI_CONNECT_TYPE_PCI_DEVICE, 0)= < 0) { - goto error; + return -1; } =20 for (i =3D 0; i < def->ncontrollers; i++) { @@ -113,7 +113,7 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, &def->controllers[i]->i= nfo, VIR_PCI_CONNECT_TYPE_PC= I_DEVICE, -1) < 0) - goto error; + return -1; } } =20 @@ -124,7 +124,7 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, &def->nets[i]->info, VIR_PCI_CONNECT_TYPE_PCI_DE= VICE, -1) < 0) - goto error; + return -1; } =20 for (i =3D 0; i < def->ndisks; i++) { @@ -140,7 +140,7 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, if (virDomainPCIAddressReserveNextAddr(addrs, &def->disks[i]->info, VIR_PCI_CONNECT_TYPE_PCI_DE= VICE, -1) < 0) - goto error; + return -1; } =20 for (i =3D 0; i < def->nvideos; i++) { @@ -150,14 +150,11 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, &def->videos[i]->info, VIR_PCI_CONNECT_TYPE_PCI_DE= VICE, -1) < 0) - goto error; + return -1; } =20 =20 return 0; - - error: - return -1; } =20 int bhyveDomainAssignPCIAddresses(virDomainDefPtr def, diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman= d.c index e74c4c2d0c..f7cedf5c65 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -374,7 +374,7 @@ bhyveParsePCISlot(const char *slotdef, val =3D g_strdup(curr); =20 if (virStrToLong_ui(val, NULL, 10, &values[i]) < 0) - goto error; + return -1; =20 VIR_FREE(val); =20 @@ -404,8 +404,6 @@ bhyveParsePCISlot(const char *slotdef, } =20 return 0; - error: - return -1; } =20 static int @@ -426,7 +424,7 @@ bhyveParsePCIDisk(virDomainDefPtr def, virDomainDiskDefPtr disk =3D NULL; =20 if (!(disk =3D virDomainDiskDefNew(NULL))) - goto cleanup; + return 0; =20 disk->bus =3D bus; disk->device =3D device; @@ -471,7 +469,6 @@ bhyveParsePCIDisk(virDomainDefPtr def, if (VIR_APPEND_ELEMENT(def->disks, def->ndisks, disk) < 0) goto error; =20 - cleanup: return 0; =20 error: @@ -664,17 +661,17 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def, if (virStrToLong_i(arg, NULL, 10, &vcpus) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse number of vCPUs")); - goto error; + return -1; } if (virDomainDefSetVcpusMax(def, vcpus, xmlopt) < 0) - goto error; + return -1; if (virDomainDefSetVcpus(def, vcpus) < 0) - goto error; + return -1; break; case 'l': CONSUME_ARG(arg); if (bhyveParseBhyveLPCArg(def, caps, arg)) - goto error; + return -1; break; case 's': CONSUME_ARG(arg); @@ -684,19 +681,19 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def, &nahcidisks, &nvirtiodisks, arg)) - goto error; + return -1; break; case 'm': CONSUME_ARG(arg); if (bhyveParseMemsize(arg, &memory)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse memory")); - goto error; + return -1; } if (def->mem.cur_balloon !=3D 0 && def->mem.cur_balloon !=3D m= emory) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse memory: size mismatch")); - goto error; + return -1; } def->mem.cur_balloon =3D memory; virDomainDefSetMemoryTotal(def, memory); @@ -714,7 +711,7 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def, if (virUUIDParse(arg, def->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot parse UUID '%s'"), arg); - goto error; + return -1; } break; case 'S': @@ -729,7 +726,7 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def, if (argc !=3D opti) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse arguments for bhyve command")); - goto error; + return -1; } =20 if (def->name =3D=3D NULL) { @@ -739,13 +736,10 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def, * error here */ virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse arguments: VM name mismatch")); - goto error; + return -1; } =20 return 0; - - error: - return -1; } =20 /* @@ -761,7 +755,6 @@ bhyveParseBhyveLoadCommandLine(virDomainDefPtr def, unsigned arguments =3D 0; size_t memory =3D 0; size_t i =3D 0; - int ret =3D -1; size_t opti; const char *arg; =20 @@ -789,12 +782,12 @@ bhyveParseBhyveLoadCommandLine(virDomainDefPtr def, if (bhyveParseMemsize(arg, &memory)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse memory")); - goto error; + return -1; } if (def->mem.cur_balloon !=3D 0 && def->mem.cur_balloon !=3D m= emory) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse memory: size mismatch")); - goto error; + return -1; } def->mem.cur_balloon =3D memory; virDomainDefSetMemoryTotal(def, memory); @@ -807,7 +800,7 @@ bhyveParseBhyveLoadCommandLine(virDomainDefPtr def, if (argc !=3D opti) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse arguments for bhyve command")); - goto error; + return -1; } =20 if (arguments !=3D 3) { @@ -824,12 +817,10 @@ bhyveParseBhyveLoadCommandLine(virDomainDefPtr def, * error here */ virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse arguments: VM name mismatch")); - goto error; + return -1; } =20 - ret =3D 0; - error: - return ret; + return 0; } =20 static int @@ -838,14 +829,12 @@ bhyveParseCustomLoaderCommandLine(virDomainDefPtr def, char **argv) { if (!argv) - goto error; + return -1; =20 def->os.bootloader =3D g_strdup(argv[0]); def->os.bootloaderArgs =3D virStringListJoin((const char**) &argv[1], = " "); =20 return 0; - error: - return -1; } =20 virDomainDefPtr --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list