From nobody Wed Mar 12 13:09:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740660630888200.6603581176256; Thu, 27 Feb 2025 04:50:30 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id B5EB216F2; Thu, 27 Feb 2025 07:50:29 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 632F11729; Thu, 27 Feb 2025 07:50:06 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id AAAC11717; Thu, 27 Feb 2025 07:50:03 -0500 (EST) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id A1ADB16DD for ; Thu, 27 Feb 2025 07:50:02 -0500 (EST) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-5dee07e51aaso1465542a12.3 for ; Thu, 27 Feb 2025 04:50:02 -0800 (PST) Received: from tulp.my.domain (80-115-115-199.cable.dynamic.v4.ziggo.nl. [80.115.115.199]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf0c6f60bdsm119059566b.109.2025.02.27.04.49.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 04:49:58 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740660601; x=1741265401; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=17qOt5HXS5i+bJsa9oi61u5pmyBM0pnSch+FUJVS3Z0=; b=QZ7DjytoEZDD3N+GWanzykp0awQL+85GZGkQkT2i0vW0mRVdKW2zR6mp1wO1CnoVfB jOk+jNzxzlpj5jmsVXKW8VrEpFD2d/G98p7eksom7Dwu56iUsUJfb7sUT3WghdOrk82h vNul2kiXYR/uh0gXoWbucYwj6rReW5W7xglJNNjKXAT2hUSgFoEwc9CSlYobNfNj7KpQ KQLq82mnoPaQxyYxA9sclCWATdxAEtg4XVnzItkzjNE4Hx73zOvr6kVGo4v4+lZpYmut 7Z7IrK3JQyL+bfDXpJwAOnLx3W3YmN0T+CZ/3LSuLGpQxdAOlyCjY2rxr1B7rWUjwrJY tHfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740660601; x=1741265401; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=17qOt5HXS5i+bJsa9oi61u5pmyBM0pnSch+FUJVS3Z0=; b=dvV1mH2BlhFw9UWtidsJdToB2cqzCDEUqwtyF1XocJoSH5f9saKrBShfaX4Q2QsWCL LUWpvqqYT9cO3IRvNg2rH0zYh5puA+WnjeknsqJLHM7xFpuvopyoNEMzsitZHGidLOiy m9VXY6AWRsAEU1zdeeW1ngDCXxUFLFUYhenlQ+mP4E0whY5A4Nyz+WzQw2TwP33yugCr AA/fvWpQCz2AaNyui7eO7KtBb2k1U0auA4dhN5pvQUNrsUhOlM5qvvIWjbUGDUfdztqo CwawUUtWSVSkjxGUNjCjJqxIf3GqdOxclPINksWoUPlhVGOu7qY/RshgORbqYpNw3jxJ Axyg== X-Gm-Message-State: AOJu0YzRgQA9qvwOaf8SD0bIMqVH71f8DpuG31fAOpP1HqaTOzcQAIcR 2gKVIa+y/xpohsqA8/ACB14DDvqyzlhZ/Gpa73excNtjBEmAIzp2k/jZBtuHn3kRvA== X-Gm-Gg: ASbGncsDDglaz4Ufal9gDhBZzQo7ZszcxfEp+vWj6RAcMJ9w6HDhvSO+FNT6oSaLveh mzeRHfh5vufisvxrNq8fVG9fB4E6Uk1YcyveKtEsMK4QUYHQM/sqJvuBZ3JYNG3yQZslib8YWe7 rBO+EOfTym+s14daFxFYsZtWEieq6ZXDKaqvmAONhfkzZlK+qctWCIJE/HMoI8r6RwWUANG9+7R BO804UREnO74rwCx7FRxWeQjbOZ3uaDU1EUFy6j454YaBk4bJuKP9WGJfnEY7GnDC+NNMNW4A5z 4CtmweYh+yv7Eml7Ui+PXTQrlfNxnpIyNDWLl2wuSuQ+XbYajomeE32CcQh0FDxAa3U0k8xVrQM = X-Google-Smtp-Source: AGHT+IECntKeFptq0Y3HKbSXn2hs3xFHcYzqozGA0ogPv9ZTlHwDeNTbLnKxlwWdUyyj2iLqx3Hewg== X-Received: by 2002:a17:906:7315:b0:ab6:ed8a:8a90 with SMTP id a640c23a62f3a-abc09a0a2d7mr2574130766b.24.1740660599105; Thu, 27 Feb 2025 04:49:59 -0800 (PST) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH] virDomainHostdevDefNew: update users not to check return value Date: Thu, 27 Feb 2025 13:46:52 +0100 Message-ID: <20250227124652.60120-1-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ETGDXCXEGDOLUQLQ4OWJAQ2F5CENN523 X-Message-ID-Hash: ETGDXCXEGDOLUQLQ4OWJAQ2F5CENN523 X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740660633361019100 Content-Type: text/plain; charset="utf-8" virDomainHostdevDefNew() has been using g_new0() for a while now. As it calls abort() on OOM, it's not necessary to check whether the return value is NULL. Signed-off-by: Roman Bogorodskiy Reviewed-by: Laine Stump --- src/conf/domain_conf.c | 3 +-- src/libxl/xen_common.c | 4 +--- src/libxl/xen_xl.c | 4 +--- src/lxc/lxc_native.c | 4 ---- src/vbox/vbox_common.c | 12 +----------- 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5630a469be..d4ce85b3a1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13316,8 +13316,7 @@ virDomainHostdevDefParseXML(virDomainXMLOption *xml= opt, =20 ctxt->node =3D node; =20 - if (!(def =3D virDomainHostdevDefNew())) - goto error; + def =3D virDomainHostdevDefNew(); =20 if (virXMLPropEnumDefault(node, "mode", virDomainHostdevModeTypeFromSt= ring, VIR_XML_PROP_NONE, diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index b7ec552631..cbcdbf5a00 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -445,9 +445,7 @@ xenParsePCI(char *entry) } } =20 - if (!(hostdev =3D virDomainHostdevDefNew())) - return NULL; - + hostdev =3D virDomainHostdevDefNew(); hostdev->managed =3D false; hostdev->writeFiltering =3D filtered; hostdev->source.subsys.type =3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 53f6871efc..482b151666 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -924,9 +924,7 @@ xenParseXLUSB(virConf *conf, virDomainDef *def) key =3D nextkey; } =20 - if (!(hostdev =3D virDomainHostdevDefNew())) - return -1; - + hostdev =3D virDomainHostdevDefNew(); hostdev->managed =3D false; hostdev->source.subsys.type =3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE= _USB; hostdev->source.subsys.u.usb.bus =3D busNum; diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index c0011e0600..7700804429 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -377,10 +377,6 @@ static virDomainHostdevDef * lxcCreateHostdevDef(const char *data) { virDomainHostdevDef *hostdev =3D virDomainHostdevDefNew(); - - if (!hostdev) - return NULL; - hostdev->mode =3D VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES; hostdev->source.caps.type =3D VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET; hostdev->source.caps.u.net.ifname =3D g_strdup(data); diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index de3c9989a5..2121d7e2d1 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3087,11 +3087,8 @@ vboxHostDeviceGetXMLDesc(struct _vboxDriver *data, v= irDomainDef *def, IMachine * /* Alloc mem needed for the filters now */ def->hostdevs =3D g_new0(virDomainHostdevDef *, def->nhostdevs); =20 - for (i =3D 0; i < def->nhostdevs; i++) { + for (i =3D 0; i < def->nhostdevs; i++) def->hostdevs[i] =3D virDomainHostdevDefNew(); - if (!def->hostdevs[i]) - goto release_hostdevs; - } =20 for (i =3D 0; i < deviceFilters.count; i++) { PRBool active =3D PR_FALSE; @@ -3138,13 +3135,6 @@ vboxHostDeviceGetXMLDesc(struct _vboxDriver *data, v= irDomainDef *def, IMachine * gVBoxAPI.UArray.vboxArrayRelease(&deviceFilters); VBOX_RELEASE(USBCommon); return; - - release_hostdevs: - for (i =3D 0; i < def->nhostdevs; i++) - virDomainHostdevDefFree(def->hostdevs[i]); - VIR_FREE(def->hostdevs); - - goto release_filters; } =20 =20 --=20 2.47.1