From nobody Fri May 17 06:07:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1622108838; cv=none; d=zohomail.com; s=zohoarc; b=aInHx9Jd8GzWRh7HxngYBm1xlT8xftbCIq3iQ2ELutTmHn5H981VvmPQjbLJxqmhhY8Ly9BVEYo8LPW9FR8wzkqYe7IbvtGElJytcPbIAOK9OZxcuv8DZbI9gw0skleHhLTEFezvxsgAMXdGO7lVV/Xs6WQnipZcbWijWhFXThA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622108838; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Uz71wqspGfj14cvtEriMzB4JxncRH/fC/EtfDRshyC0=; b=iUKwwMdfASWyJIyhvp9/MWI4vcg+bE5NCiPHJcgXgdnGr5wEAaB8cTlHpPSA2foXw7HQ5DAr9jk2kpJnrw/szzN1CULGGjzT4sOXFwjvMFEt2ri3cdAozc1MwpLJ8on8AshleSRk9WtWjqsJK5hMq9ZpVBx3eU2VWd14zmznQtc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622108838902413.6775630977679; Thu, 27 May 2021 02:47:18 -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-198-F2bDv6RhOEy04Wbxh_rD7Q-1; Thu, 27 May 2021 05:47:15 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id BEAB58049CB; Thu, 27 May 2021 09:47:09 +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 4AA6B687E4; Thu, 27 May 2021 09:47:07 +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 4245B8C05; Thu, 27 May 2021 09:47:03 +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 14R9l2Go004587 for ; Thu, 27 May 2021 05:47:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 006D71002EF0; Thu, 27 May 2021 09:47:02 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.234]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7830D10016FF for ; Thu, 27 May 2021 09:46:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622108837; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Uz71wqspGfj14cvtEriMzB4JxncRH/fC/EtfDRshyC0=; b=Ris3Zzs065tZj+LZrPSO9VjFg9dtMlOWFgtLBKcqA8yMHEGPBN9KQOyFrhr6BatfeYxlRg 4B8yk/IeEMVgr1/YPNj6Uk9IPHssVAEeaSwY1bgXN+/TtPKwof27GYnf96TmSGdsMHyRDb 6mptsHUBEnS+4RqzHVqjE3Q0mBbtgzo= X-MC-Unique: F2bDv6RhOEy04Wbxh_rD7Q-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH for 7.4.0] virCapabilitiesHostNUMAInitReal: Don't jump over cleanup Date: Thu, 27 May 2021 11:46:56 +0200 Message-Id: <2ae61b3eaf83e32654da7c03180954d0443e2b8f.1622108800.git.mprivozn@redhat.com> 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.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" In one of my recent commits I've done some renaming. But whilst doing so I also mistakenly replaced 'goto cleanup' with 'return -1' in virCapabilitiesHostNUMAInitReal() which was incorrect. Fixes: fe25224fdaa53bbeceed3ddeef1b3a150665e656 Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/conf/capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 1290c9c15d..2f9a1e7d1f 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1623,7 +1623,7 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps) } =20 if (virCapabilitiesGetNUMADistances(n, &distances, &ndistances) < = 0) - return -1; + goto cleanup; =20 if (virCapabilitiesGetNUMAPagesInfo(n, &pageinfo, &npageinfo) < 0) goto cleanup; --=20 2.31.1