From nobody Mon Feb 9 19:53:46 2026 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=1636373942; cv=none; d=zohomail.com; s=zohoarc; b=IrWtcswTG/AvHihwUbuCUPYj0z7nly4l7Ji903ACXJbuDCAQbVc4LhyIvusBpWDQGLS1519d/rWHGGlQ6v3+tuHWjG+UBJzGTp9e6Avg0tyNGG0ZI6H67Jo49MXNorFAcwhDS0NjHoMH6xyBrx/Rn1XlkVL+aKIX+6tp7iN6RT4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636373942; 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=rfQnkWrtQrs/Y9P3r1buvMRRjJfcWhXweS39sCDFDi0=; b=kLHzDtdTnPnhsBYRpQ9r/ZcTfPL7l4dgi5CKBu0p/nfbkbn+BV/4klbsehDi8z8MpnD2bVCMklgGIkINBhsv4hKxukEwL34hB35LnavAGKQmy0D5/QGi7lmdmAT+nRnaxAeZQJCL5QCdKVnOJHF1pTemuT2cm+4MkyW6gFy8Vjc= 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) 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 1636373942763676.4906414763769; Mon, 8 Nov 2021 04:19:02 -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-478-mOILwDuIMeis3ecL0wUGrg-1; Mon, 08 Nov 2021 07:19:00 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 593C1A40C1; Mon, 8 Nov 2021 12:18:55 +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 11D734180; Mon, 8 Nov 2021 12:18:55 +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 D51A64EA37; Mon, 8 Nov 2021 12:18: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 1A8CIp25011876 for ; Mon, 8 Nov 2021 07:18:51 -0500 Received: by smtp.corp.redhat.com (Postfix) id CE13D1816A; Mon, 8 Nov 2021 12:18:51 +0000 (UTC) Received: from work.redhat.com (unknown [10.39.193.223]) by smtp.corp.redhat.com (Postfix) with ESMTP id 208335DEFB; Mon, 8 Nov 2021 12:18:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636373941; 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=rfQnkWrtQrs/Y9P3r1buvMRRjJfcWhXweS39sCDFDi0=; b=e4xzOa1Kt+Lcy4DbONTyXv8aRvvtd9lKabLWVJnSOXITdOYJmgUS+Dfufvx/kTeeDhDynV 2CMFynWy2rjZsFZW3IwWhW1lOWWxi4n9SWvAGpNjSZ8vlD2hX5vqJUI6dkJaILYgeLNW1k K1GRlBYgOxOqSrHjEzJc4f69laZsq90= X-MC-Unique: mOILwDuIMeis3ecL0wUGrg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 08/10] fillXenCaps: Cleanup Date: Mon, 8 Nov 2021 13:17:38 +0100 Message-Id: <20211108121740.98621-9-twiederh@redhat.com> In-Reply-To: <20211108121740.98621-1-twiederh@redhat.com> References: <20211108121740.98621-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.11 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) X-ZM-MESSAGEID: 1636373944207100003 Content-Type: text/plain; charset="utf-8" Rework to remove unnecessary label and goto. Signed-off-by: Tim Wiederhake --- tests/domaincapstest.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 9ea5bed5c2..4a46acb9ad 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -135,25 +135,17 @@ fillQemuCaps(virDomainCaps *domCaps, static int fillXenCaps(virDomainCaps *domCaps) { - virFirmware **firmwares; - int ret =3D -1; - - firmwares =3D g_new0(virFirmware *, 2); - - firmwares[0] =3D g_new0(virFirmware, 1); - firmwares[1] =3D g_new0(virFirmware, 1); + g_autoptr(virFirmware) fw_hvmloader =3D g_new0(virFirmware, 1); + g_autoptr(virFirmware) fw_ovmf =3D g_new0(virFirmware, 1); + virFirmware *firmwares[] =3D { fw_hvmloader, fw_ovmf }; =20 firmwares[0]->name =3D g_strdup("/usr/lib/xen/boot/hvmloader"); firmwares[1]->name =3D g_strdup("/usr/lib/xen/boot/ovmf.bin"); =20 if (libxlMakeDomainCapabilities(domCaps, firmwares, 2) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - virFirmwareFreeList(firmwares, 2); - return ret; + return 0; } #endif /* WITH_LIBXL */ =20 --=20 2.31.1