From nobody Sun Feb 8 20:12:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562157716; cv=none; d=zoho.com; s=zohoarc; b=HiVDSPfjrLR+qgLTvKr0u31cOf3f7FddCiUsxsl9/mc3Iry9fkhXgMnrZ/n/HfLANi1vi30zTA6A4HvcmPGfCpB+1uPB+WpIVnCx8wfTK4X1X6INxAqe/oWzxSUxJiDbwynfCpeLTFY3yL/xGz5q/M1xFel1WQYY+PQnUBIwFA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562157716; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=+0llv7/RqfoNOUhN44GBepZZykL74gGZVP6v0yCBNOg=; b=NzgyUgf4u6b0yU2EwuwUN/lXK1yo60fqaaIi9RYmnp8/Q/9PzQ496X5vJ3gyJmSA/xyeClOGqnIUDES8WnRDPDhYR3n1HPnVJ7jI7jquuIIof408LO7fFFA8sfHen75qLBxKKvcgDK+/zmHipLy6/4m9EEB5JPbeUYADObEdGzc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1562157716325661.541991671999; Wed, 3 Jul 2019 05:41:56 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B128C307D88C; Wed, 3 Jul 2019 12:41:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7159F8DFB4; Wed, 3 Jul 2019 12:41:54 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 352503D87; Wed, 3 Jul 2019 12:41:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x63CcHmt007818 for ; Wed, 3 Jul 2019 08:38:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 193778B171; Wed, 3 Jul 2019 12:38:17 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 98A1B834EB for ; Wed, 3 Jul 2019 12:38:16 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 3 Jul 2019 14:38:00 +0200 Message-Id: <613508b514ea258a0612e669db6cef6fd892a695.1562157378.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 08/14] xenconfig: Remove pointless label in xenParseSxprSound X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 03 Jul 2019 12:41:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The 'error' label just returned -1. Inline it. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/xenconfig/xen_sxpr.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index 4328875475..7404aac071 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -303,13 +303,13 @@ xenParseSxprSound(virDomainDefPtr def, if (VIR_ALLOC_N(def->sounds, VIR_DOMAIN_SOUND_MODEL_ES1370 + 1) < 0) - goto error; + return -1; for (i =3D 0; i < (VIR_DOMAIN_SOUND_MODEL_ES1370 + 1); i++) { virDomainSoundDefPtr sound; if (VIR_ALLOC(sound) < 0) - goto error; + return -1; sound->model =3D i; def->sounds[def->nsounds++] =3D sound; } @@ -329,20 +329,20 @@ xenParseSxprSound(virDomainDefPtr def, virReportError(VIR_ERR_INTERNAL_ERROR, _("Sound model %s too big for destination"), offset); - goto error; + return -1; } if (VIR_ALLOC(sound) < 0) - goto error; + return -1; if ((sound->model =3D virDomainSoundModelTypeFromString(model)= ) < 0) { VIR_FREE(sound); - goto error; + return -1; } if (VIR_APPEND_ELEMENT(def->sounds, def->nsounds, sound) < 0) { virDomainSoundDefFree(sound); - goto error; + return -1; } offset =3D offset2 ? offset2 + 1 : NULL; @@ -350,7 +350,4 @@ xenParseSxprSound(virDomainDefPtr def, } return 0; - - error: - return -1; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list