From nobody Sun Feb 8 19:48:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1633596531; cv=none; d=zohomail.com; s=zohoarc; b=I4iDGY5M2T9nAXyxTUwXTdMzsdEZTk7jFI+/NnTMyZHMSLHWQEOev7Ia89UOwS2HzVbU3Z3ffbvun3xCzd8lCsjGK5fUpJxilbz0euRECRAhbs1xfMuW9AkSrcX8fWaBFcfEMr1cvL4BlPTciMt29g+PiHKnAlRxI8A5Wuxt1vQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633596531; 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; bh=osMdpKwjV5qSGKHSqnzELqD9vlTgE7/DpiPH1USjsQo=; b=YMML0hqJrk4pUlQpRlA8jv9g49GwAtWTJX8gSGiMYtgKmx5ZrQaiGj6BQRimRpw2VQPZ9d4R1sh2mGQQ/JpVQ9B/1s13ICBjb1m+/EaIMpA7CBJykH35hqb1RJUxOpO1b6hGGm8SsMRZgQbaVI0aAuDBhR7xZc62RNd03FZdpRQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1633596531188219.7125473758582; Thu, 7 Oct 2021 01:48:51 -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-595-LbY0NU4qPaew1xt2rRxfNQ-1; Thu, 07 Oct 2021 04:48:46 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7B61F10144FB; Thu, 7 Oct 2021 08:48:41 +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 563891F467; Thu, 7 Oct 2021 08:48:41 +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 1FAA21803B30; Thu, 7 Oct 2021 08:48:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1978lgML023585 for ; Thu, 7 Oct 2021 04:47:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 493101972D; Thu, 7 Oct 2021 08:47:42 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0CA319D9D for ; Thu, 7 Oct 2021 08:47:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633596530; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=osMdpKwjV5qSGKHSqnzELqD9vlTgE7/DpiPH1USjsQo=; b=Z+89bhh4rdq0+t5S1Fk2NLdVcEAvkLlATqstk4c+kLyViHwrGH52EyS1VzV7s0kkfhoOrH WncH3Fj8IVtOh8LAjt+AFLdVTd5+F0SKhNwCGZL6hiVK7Z1PvmlGlcmIKqIfUfRYNoWK/e MRCVJzGV2qdZ33toTrobQRrGfp3Pc4A= X-MC-Unique: LbY0NU4qPaew1xt2rRxfNQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/2] lib: Don't check for virCapabilitiesAddGuestDomain() retval Date: Thu, 7 Oct 2021 10:47:28 +0200 Message-Id: <2957dd521b3fefab012ff42d55928e95443918a9.1633596399.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.84 on 10.5.11.23 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: 1633596531899100001 Content-Type: text/plain; charset="utf-8" The virCapabilitiesAddGuestDomain() function can't fail. It aborts on OOM. Therefore, there's no need to check for its return value. Signed-off-by: Michal Privoznik --- src/bhyve/bhyve_capabilities.c | 5 ++--- src/ch/ch_conf.c | 10 ++-------- src/esx/esx_driver.c | 8 ++++---- src/hyperv/hyperv_driver.c | 8 ++++---- src/libxl/libxl_capabilities.c | 9 ++------- src/lxc/lxc_conf.c | 18 ++++-------------- src/openvz/openvz_conf.c | 9 ++------- src/qemu/qemu_capabilities.c | 20 ++++---------------- src/security/virt-aa-helper.c | 11 ++--------- src/test/test_driver.c | 9 ++------- src/vbox/vbox_common.c | 9 ++------- src/vmware/vmware_conf.c | 12 ++++-------- src/vz/vz_driver.c | 4 +--- tests/testutils.c | 29 ++++++++++++----------------- tests/testutilslxc.c | 8 ++------ tests/testutilsqemu.c | 19 +++++-------------- tests/testutilsxen.c | 15 ++++++--------- tests/vmx2xmltest.c | 18 ++++-------------- tests/xml2vmxtest.c | 19 ++++--------------- 19 files changed, 68 insertions(+), 172 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index cc1c7b66b3..bbcdee724f 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -54,9 +54,8 @@ virBhyveCapsBuild(void) VIR_ARCH_X86_64, "bhyve", NULL, 0, NULL); =20 - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_BHYVE, - NULL, NULL, 0, NULL) =3D=3D NULL) - goto error; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_BHYVE, + NULL, NULL, 0, NULL); =20 if (!(caps->host.cpu =3D virCPUProbeHost(caps->host.arch))) VIR_WARN("Failed to get host CPU"); diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index d0c56f6890..ef6f4b5ba8 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -68,14 +68,8 @@ virCaps *virCHDriverCapsInit(void) guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, caps->host.arch, NULL, NULL, 0, NULL); =20 - if (virCapabilitiesAddGuestDomain(guest, - VIR_DOMAIN_VIRT_KVM, - NULL, - NULL, - 0, - NULL) =3D=3D NULL) - goto cleanup; - + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, + NULL, NULL, 0, NULL); return caps; =20 cleanup: diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index f90af3c9c4..d14d6e6308 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -567,8 +567,8 @@ esxCapsInit(esxPrivate *priv) NULL, NULL, 0, NULL); =20 - if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, NULL= , NULL, 0, NULL)) - goto failure; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, + NULL, NULL, 0, NULL); =20 /* x86_64 */ if (supportsLongMode =3D=3D esxVI_Boolean_True) { @@ -577,8 +577,8 @@ esxCapsInit(esxPrivate *priv) NULL, NULL, 0, NULL); =20 - if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, = NULL, NULL, 0, NULL)) - goto failure; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, + NULL, NULL, 0, NULL); } =20 return caps; diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index aa70fdbfec..4ef3a36253 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -277,15 +277,15 @@ hypervCapsInit(hypervPrivate *priv) guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARC= H_I686, NULL, NULL, 0, NULL); =20 - if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_HYPERV, NULL= , NULL, 0, NULL)) - goto error; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_HYPERV, + NULL, NULL, 0, NULL); =20 /* x86_64 caps */ guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARC= H_X86_64, NULL, NULL, 0, NULL); =20 - if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_HYPERV, NULL= , NULL, 0, NULL)) - goto error; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_HYPERV, + NULL, NULL, 0, NULL); =20 return caps; =20 diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index c8020ee801..e03b6fd3c3 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -486,13 +486,8 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCaps *caps) machines); machines =3D NULL; =20 - if (virCapabilitiesAddGuestDomain(guest, - VIR_DOMAIN_VIRT_XEN, - NULL, - NULL, - 0, - NULL) =3D=3D NULL) - return -1; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN, + NULL, NULL, 0, NULL); =20 if (guest_archs[i].pae) virCapabilitiesAddGuestFeature(guest, VIR_CAPS_GUEST_FEATURE_T= YPE_PAE); diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index a0a8dccae9..73156f15a3 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -100,26 +100,16 @@ virCaps *virLXCDriverCapsInit(virLXCDriver *driver) guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE, caps->host.arch, lxc_path, NULL, 0, NU= LL); =20 - if (virCapabilitiesAddGuestDomain(guest, - VIR_DOMAIN_VIRT_LXC, - NULL, - NULL, - 0, - NULL) =3D=3D NULL) - goto error; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_LXC, + NULL, NULL, 0, NULL); =20 /* On 64-bit hosts, we can use personality() to request a 32bit proces= s */ if ((altArch =3D lxcContainerGetAlt32bitArch(caps->host.arch)) !=3D VI= R_ARCH_NONE) { guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE, altArch, lxc_path, NULL, 0, NULL); =20 - if (virCapabilitiesAddGuestDomain(guest, - VIR_DOMAIN_VIRT_LXC, - NULL, - NULL, - 0, - NULL) =3D=3D NULL) - goto error; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_LXC, + NULL, NULL, 0, NULL); } =20 if (driver) { diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index c6230baab4..9f879e90eb 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -159,13 +159,8 @@ virCaps *openvzCapsInit(void) guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE, caps->host.arch, NULL, NULL, 0, NULL); =20 - if (virCapabilitiesAddGuestDomain(guest, - VIR_DOMAIN_VIRT_OPENVZ, - NULL, - NULL, - 0, - NULL) =3D=3D NULL) - return NULL; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_OPENVZ, + NULL, NULL, 0, NULL); =20 return g_steal_pointer(&caps); } diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2b1b1236ce..5358696209 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1058,25 +1058,13 @@ virQEMUCapsInitGuestFromBinary(virCaps *caps, true, false); =20 if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_TCG)) { - if (virCapabilitiesAddGuestDomain(guest, - VIR_DOMAIN_VIRT_QEMU, - NULL, - NULL, - 0, - NULL) =3D=3D NULL) { - goto cleanup; - } + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU, + NULL, NULL, 0, NULL); } =20 if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { - if (virCapabilitiesAddGuestDomain(guest, - VIR_DOMAIN_VIRT_KVM, - NULL, - NULL, - 0, - NULL) =3D=3D NULL) { - goto cleanup; - } + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, + NULL, NULL, 0, NULL); } =20 if ((ARCH_IS_X86(guestarch) || guestarch =3D=3D VIR_ARCH_AARCH64)) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index a28bec1f20..7c21ab9515 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -650,15 +650,8 @@ get_definition(vahControl * ctl, const char *xmlStr) return -1; } =20 - if (virCapabilitiesAddGuestDomain(guest, - virtType, - NULL, - NULL, - 0, - NULL) =3D=3D NULL) { - vah_error(ctl, 0, _("could not allocate memory")); - return -1; - } + virCapabilitiesAddGuestDomain(guest, virtType, + NULL, NULL, 0, NULL); =20 ctl->def =3D virDomainDefParseString(xmlStr, ctl->xmlopt, NULL, diff --git a/src/test/test_driver.c b/src/test/test_driver.c index d6d1efc8a3..e761baca7f 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -348,13 +348,8 @@ testBuildCapabilities(virConnectPtr conn) guest =3D virCapabilitiesAddGuest(caps, guest_types[i], VIR_ARCH_I= 686, TEST_EMULATOR, NULL, 0, NULL); =20 - if (virCapabilitiesAddGuestDomain(guest, - VIR_DOMAIN_VIRT_TEST, - NULL, - NULL, - 0, - NULL) =3D=3D NULL) - goto error; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_TEST, + NULL, NULL, 0, NULL); =20 virCapabilitiesAddGuestFeature(guest, VIR_CAPS_GUEST_FEATURE_TYPE_= PAE); virCapabilitiesAddGuestFeature(guest, VIR_CAPS_GUEST_FEATURE_TYPE_= NONPAE); diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 6f6b7e321a..d6f96f7742 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -104,13 +104,8 @@ vboxCapsInit(void) caps->host.arch, NULL, NULL, 0, NULL); return NULL; =20 - if (virCapabilitiesAddGuestDomain(guest, - VIR_DOMAIN_VIRT_VBOX, - NULL, - NULL, - 0, - NULL) =3D=3D NULL) - return NULL; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VBOX, + NULL, NULL, 0, NULL); =20 return g_steal_pointer(&caps); } diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 3be0a845a0..811507cd55 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -81,10 +81,8 @@ vmwareCapsInit(void) guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_I686, NULL, NULL, 0, NULL); =20 - if (virCapabilitiesAddGuestDomain(guest, - VIR_DOMAIN_VIRT_VMWARE, - NULL, NULL, 0, NULL) =3D=3D NULL) - goto error; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, + NULL, NULL, 0, NULL); guest =3D NULL; =20 if (!(caps->host.cpu =3D virCPUProbeHost(caps->host.arch))) @@ -103,10 +101,8 @@ vmwareCapsInit(void) guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64, NULL, NULL, 0, NU= LL); =20 - if (virCapabilitiesAddGuestDomain(guest, - VIR_DOMAIN_VIRT_VMWARE, - NULL, NULL, 0, NULL) =3D=3D NULL) - goto error; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, + NULL, NULL, 0, NULL); guest =3D NULL; } =20 diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index e798ddf5ee..b47266290c 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -88,9 +88,7 @@ vzCapsAddGuestDomain(virCaps *caps, return -1; =20 =20 - if (virCapabilitiesAddGuestDomain(guest, virt_type, - NULL, NULL, 0, NULL) =3D=3D NULL) - return -1; + virCapabilitiesAddGuestDomain(guest, virt_type, NULL, NULL, 0, NULL); =20 return 0; } diff --git a/tests/testutils.c b/tests/testutils.c index 1841d92061..517afa7957 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -906,27 +906,22 @@ virTestGenericCapsInit(void) guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARC= H_I686, "/usr/bin/acme-virt", NULL, 0, NULL); =20 - if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_TEST, NULL, = NULL, 0, NULL)) - return NULL; - if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU, - NULL, NULL, 0, NULL)) - return NULL; - if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, - NULL, NULL, 0, NULL)) - return NULL; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_TEST, + NULL, NULL, 0, NULL); + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU, + NULL, NULL, 0, NULL); + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, + NULL, NULL, 0, NULL); =20 guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARC= H_X86_64, "/usr/bin/acme-virt", NULL, 0, NULL); =20 - if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_TEST, NULL, = NULL, 0, NULL)) - return NULL; - if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU, - NULL, NULL, 0, NULL)) - return NULL; - if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, - NULL, NULL, 0, NULL)) - return NULL; - + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_TEST, + NULL, NULL, 0, NULL); + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU, + NULL, NULL, 0, NULL); + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, + NULL, NULL, 0, NULL); =20 if (virTestGetDebug() > 1) { g_autofree char *caps_str =3D NULL; diff --git a/tests/testutilslxc.c b/tests/testutilslxc.c index 1ee034c7b3..857407dfb2 100644 --- a/tests/testutilslxc.c +++ b/tests/testutilslxc.c @@ -23,18 +23,14 @@ testLXCCapsInit(void) "/usr/libexec/libvirt_lxc", NULL, 0, NULL); =20 - if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_LXC, NULL, N= ULL, 0, NULL)) - goto error; - + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_LXC, NULL, NULL, = 0, NULL); =20 guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE, VIR_ARCH_X86_64, "/usr/libexec/libvirt_lxc", NULL, 0, NULL); =20 - if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_LXC, NULL, N= ULL, 0, NULL)) - goto error; - + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_LXC, NULL, NULL, = 0, NULL); =20 if (virTestGetDebug()) { g_autofree char *caps_str =3D NULL; diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 6ab7a10fb1..5bd1d40ad4 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -176,13 +176,8 @@ testQemuAddGuest(virCaps *caps, arch =3D=3D VIR_ARCH_X86_64) virCapabilitiesAddGuestFeature(guest, VIR_CAPS_GUEST_FEATURE_TYPE_= CPUSELECTION); =20 - if (!virCapabilitiesAddGuestDomain(guest, - VIR_DOMAIN_VIRT_QEMU, - NULL, - NULL, - 0, - NULL)) - goto error; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU, + NULL, NULL, 0, NULL); =20 if (kvm_machines[emu_arch] !=3D NULL) { nmachines =3D g_strv_length((char **)kvm_machines[emu_arch]); @@ -191,13 +186,9 @@ testQemuAddGuest(virCaps *caps, if (machines =3D=3D NULL) goto error; =20 - if (!virCapabilitiesAddGuestDomain(guest, - VIR_DOMAIN_VIRT_KVM, - qemu_emulators[emu_arch], - NULL, - nmachines, - machines)) - goto error; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, + qemu_emulators[emu_arch], + NULL, nmachines, machines); } =20 return 0; diff --git a/tests/testutilsxen.c b/tests/testutilsxen.c index 0f69a71200..1b584e34b1 100644 --- a/tests/testutilsxen.c +++ b/tests/testutilsxen.c @@ -40,9 +40,8 @@ testXLInitCaps(void) "/usr/lib/xen/boot/hvmloader", nmachines, machines); machines =3D NULL; - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN, NULL, - NULL, 0, NULL) =3D=3D NULL) - goto cleanup; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN, + NULL, NULL, 0, NULL); nmachines =3D G_N_ELEMENTS(xen_machines); if ((machines =3D virCapabilitiesAllocMachines(xen_machines, nmachines= )) =3D=3D NULL) goto cleanup; @@ -54,9 +53,8 @@ testXLInitCaps(void) nmachines, machines); machines =3D NULL; =20 - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN, NULL, - NULL, 0, NULL) =3D=3D NULL) - goto cleanup; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN, + NULL, NULL, 0, NULL); nmachines =3D G_N_ELEMENTS(pvh_machines); if ((machines =3D virCapabilitiesAllocMachines(pvh_machines, nmachines= )) =3D=3D NULL) goto cleanup; @@ -68,9 +66,8 @@ testXLInitCaps(void) nmachines, machines); machines =3D NULL; =20 - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN, NULL, - NULL, 0, NULL) =3D=3D NULL) - goto cleanup; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN, + NULL, NULL, 0, NULL); return caps; =20 cleanup: diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index e976148a29..257bda3b0e 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -35,26 +35,16 @@ testCapsInit(void) VIR_ARCH_I686, NULL, NULL, 0, NULL); =20 - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, NULL,= NULL, 0, - NULL) =3D=3D NULL) { - goto failure; - } + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, + NULL, NULL, 0, NULL); =20 /* x86_64 guest */ guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64, NULL, NULL, 0, NULL); =20 - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, NULL,= NULL, 0, - NULL) =3D=3D NULL) { - goto failure; - } - - return; - - failure: - virObjectUnref(caps); - caps =3D NULL; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, + NULL, NULL, 0, NULL); } =20 static int diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 6c65a8bcf3..cd6d81947b 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -36,27 +36,16 @@ testCapsInit(void) VIR_ARCH_I686, NULL, NULL, 0, NULL); =20 - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, NULL,= NULL, 0, - NULL) =3D=3D NULL) { - goto failure; - } + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, + NULL, NULL, 0, NULL); =20 /* x86_64 guest */ guest =3D virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64, NULL, NULL, 0, NULL); =20 - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, NULL,= NULL, 0, - NULL) =3D=3D NULL) { - goto failure; - } - - return; - - failure: - virObjectUnref(caps); - virObjectUnref(xmlopt); - caps =3D NULL; + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, + NULL, NULL, 0, NULL); } =20 static int --=20 2.32.0