From nobody Sun Feb 8 21:21:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1677853722; cv=none; d=zohomail.com; s=zohoarc; b=GUTC1LSXOugD+7l6NJZJ9BZzvFxDW56Q5ox1dLneg/N+8GLLsP2MrACy6FCaVM/InpzUBNhCvGzEj4fIGrrjbJ1Ft5UYV8Y387LC5pcgXy0ZlkMSwRU/WM/IiBZ70gktYcNvbB3Zlc8HDb9T7V+R5WI+uO9EgIx/VJBpqG4tSDk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677853722; 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=df6th20GlzeJYiGqygoO8UevX1Jm7+2kbcF0siYyPbs=; b=RbLUV6U5LncEzNW/UORQ4VpdgDYBjObHqEeSshHNY4P8XlEvwN1eCZnAnXrlFC0xhhIkB1RQmRnTJKXygEWqbudWY43xWnCn42G7C/mMUd+88WSaRKuK0asxva9SxKzR1ajMSlukyk5zU5T4aKQrcLGc5TgTycal9yCKxM0c12g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1677853722724264.9154445074287; Fri, 3 Mar 2023 06:28:42 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-557-oraZkzxoMZKOdHWP1esWlA-1; Fri, 03 Mar 2023 09:28:39 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 66F98185A78B; Fri, 3 Mar 2023 14:28:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 558CB492C3E; Fri, 3 Mar 2023 14:28:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 939FD194A289; Fri, 3 Mar 2023 14:28:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CF12D1943BCF for ; Fri, 3 Mar 2023 14:28:17 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CAB084051E4B; Fri, 3 Mar 2023 14:28:17 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 527704051E4A for ; Fri, 3 Mar 2023 14:28:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677853721; 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=df6th20GlzeJYiGqygoO8UevX1Jm7+2kbcF0siYyPbs=; b=IZg1yLtC2x3elJtS5qEak04AHHkCPY8VzlR7k3zB5lsarz3kMmhJ98UaCf3KXKgzixk18O r0c4MxoY5ptwXmn8h9cwm5U86nDmwZt0zQN28GmGoDLGgC+wYSN7f2y9CVx5T7ANTYaC/e dWjEwuZMjcZ3VU2BO4d1gxB0JRBHX/U= X-MC-Unique: oraZkzxoMZKOdHWP1esWlA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 11/31] qemu: capabilities: Don't make callers check return of virQEMUCapsNew(Binary) Date: Fri, 3 Mar 2023 15:27:45 +0100 Message-Id: <241e900df7520fcfc5da8f957471bdb66f927c2b.1677853487.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1677853724652100003 Content-Type: text/plain; charset="utf-8" The allocation of the object itself can't fail. What can fail is the creation of the class on a programmign error. Rather than punting the error up the stack abort() directly on the first occurence as the error can't be fixed during runtime. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 20 ++++---------------- src/qemu/qemu_domain.c | 3 +-- tests/cputest.c | 3 +-- tests/qemucapabilitiestest.c | 6 +++--- tests/qemucaps2xmltest.c | 3 +-- tests/qemuhotplugtest.c | 3 +-- tests/qemumemlocktest.c | 5 +---- tests/securityselinuxlabeltest.c | 3 +-- tests/testutilsqemu.c | 8 +++----- 9 files changed, 16 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3cb5785baa..35f8e9828a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1828,11 +1828,9 @@ virQEMUCapsNew(void) virQEMUCaps *qemuCaps; if (virQEMUCapsInitialize() < 0) - return NULL; - - if (!(qemuCaps =3D virObjectNew(virQEMUCapsClass))) - return NULL; + abort(); + qemuCaps =3D virObjectNew(virQEMUCapsClass); qemuCaps->invalidation =3D true; qemuCaps->flags =3D virBitmapNew(QEMU_CAPS_LAST); @@ -1845,8 +1843,7 @@ virQEMUCapsNewBinary(const char *binary) { virQEMUCaps *qemuCaps =3D virQEMUCapsNew(); - if (qemuCaps) - qemuCaps->binary =3D g_strdup(binary); + qemuCaps->binary =3D g_strdup(binary); return qemuCaps; } @@ -1990,9 +1987,6 @@ virQEMUCaps *virQEMUCapsNewCopy(virQEMUCaps *qemuCaps) g_autoptr(virQEMUCaps) ret =3D virQEMUCapsNewBinary(qemuCaps->binary); size_t i; - if (!ret) - return NULL; - ret->invalidation =3D qemuCaps->invalidation; ret->kvmSupportsNesting =3D qemuCaps->kvmSupportsNesting; ret->kvmSupportsSecureGuest =3D qemuCaps->kvmSupportsSecureGuest; @@ -5858,12 +5852,9 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, const char *kernelVersion, virCPUData* cpuData) { - g_autoptr(virQEMUCaps) qemuCaps =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D virQEMUCapsNewBinary(binary); struct stat sb; - if (!(qemuCaps =3D virQEMUCapsNewBinary(binary))) - return NULL; - /* We would also want to check faccessat if we cared about ACLs, * but we don't. */ if (stat(binary, &sb) < 0) { @@ -5949,9 +5940,6 @@ virQEMUCapsLoadFile(const char *filename, virQEMUCapsCachePriv *priv =3D privData; int ret; - if (!qemuCaps) - return NULL; - ret =3D virQEMUCapsLoadCache(priv->hostArch, qemuCaps, filename, false= ); if (ret < 0) return NULL; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a083e7e1ef..a44ac83295 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3197,8 +3197,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, return -1; } if (n > 0) { - if (!(qemuCaps =3D virQEMUCapsNew())) - return -1; + qemuCaps =3D virQEMUCapsNew(); for (i =3D 0; i < n; i++) { g_autofree char *str =3D virXMLPropString(nodes[i], "name"); diff --git a/tests/cputest.c b/tests/cputest.c index 9b76cce2a8..b3253e3116 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -458,8 +458,7 @@ cpuTestMakeQEMUCaps(const struct data *data) cpu, true, false, fail_no_props, &= model) < 0) return NULL; - if (!(qemuCaps =3D virQEMUCapsNew())) - return NULL; + qemuCaps =3D virQEMUCapsNew(); virQEMUCapsSet(qemuCaps, QEMU_CAPS_KVM); if (data->flags =3D=3D JSON_MODELS || diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 0066ba15fa..58beeb48cb 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -95,9 +95,9 @@ testQemuCaps(const void *opaque) binary =3D g_strdup_printf("/usr/bin/qemu-system-%s", data->archName); - if (!(capsActual =3D virQEMUCapsNewBinary(binary)) || - virQEMUCapsInitQMPMonitor(capsActual, - qemuMonitorTestGetMonitor(mon)) < 0) + capsActual =3D virQEMUCapsNewBinary(binary); + + if (virQEMUCapsInitQMPMonitor(capsActual, qemuMonitorTestGetMonitor(mo= n)) < 0) return -1; if (virQEMUCapsGet(capsActual, QEMU_CAPS_KVM)) { diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 942c8e7aa4..badbce986e 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -64,8 +64,7 @@ testQemuGetCaps(char *caps) return NULL; } - if (!(qemuCaps =3D virQEMUCapsNew())) - return NULL; + qemuCaps =3D virQEMUCapsNew(); for (i =3D 0; i < n; i++) { g_autofree char *str =3D virXMLPropString(nodes[i], "name"); diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 215837fc8f..a82e35f087 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -68,8 +68,7 @@ qemuHotplugCreateObjects(virDomainXMLOption *xmlopt, priv =3D (*vm)->privateData; - if (!(priv->qemuCaps =3D virQEMUCapsNew())) - return -1; + priv->qemuCaps =3D virQEMUCapsNew(); virQEMUCapsInitQMPBasicArch(priv->qemuCaps); diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index b303f70e9d..f2e1714841 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -95,10 +95,7 @@ mymain(void) DO_TEST("pc-kvm", 0); DO_TEST("pc-tcg", 0); - if (!(qemuCaps =3D virQEMUCapsNew())) { - ret =3D -1; - goto cleanup; - } + qemuCaps =3D virQEMUCapsNew(); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI); diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabelt= est.c index 4f97edad17..30bd68b550 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -322,8 +322,7 @@ mymain(void) if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; - if (!(qemuCaps =3D virQEMUCapsNew())) - return EXIT_FAILURE; + qemuCaps =3D virQEMUCapsNew(); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_CIRRUS_VGA); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC); diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index b5bf6829b7..ef78616062 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -372,12 +372,11 @@ virQEMUCaps * qemuTestParseCapabilitiesArch(virArch arch, const char *capsFile) { - g_autoptr(virQEMUCaps) qemuCaps =3D NULL; g_autofree char *binary =3D g_strdup_printf("/usr/bin/qemu-system-%s", virArchToString(arch)); + g_autoptr(virQEMUCaps) qemuCaps =3D virQEMUCapsNewBinary(binary); - if (!(qemuCaps =3D virQEMUCapsNewBinary(binary)) || - virQEMUCapsLoadCache(arch, qemuCaps, capsFile, true) < 0) + if (virQEMUCapsLoadCache(arch, qemuCaps, capsFile, true) < 0) return NULL; return g_steal_pointer(&qemuCaps); @@ -844,8 +843,7 @@ testQemuInfoSetArgs(struct testQemuInfo *info, testQemuInfoArgName argname; int flag; - if (!(info->args.fakeCaps =3D virQEMUCapsNew())) - abort(); + info->args.fakeCaps =3D virQEMUCapsNew(); info->conf =3D conf; info->args.newargs =3D true; --=20 2.39.2