From nobody Sun Feb 8 21:29:02 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=1622619489; cv=none; d=zohomail.com; s=zohoarc; b=mVs+kJSfWWVaLgOzeHWyEYY87mIj1BkjeB/J8L1LOHe3/PvFkYrcwSCEBEom5xF2EzyQdDtIHJX0d53ToHsrOx5OyRiQS0fp9CgquONfPoR1bq+Mk2pqKW/kitLfJM0Avb7CHbimnIENOFAKmNtQVCaFuB2fMfYjSVsevQVokOo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622619489; 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=ALYqXgDPrH3LaZE3Bgou40UzriznJ6BUZCELgv0A5ps=; b=UxtR+o84wRuaiZfJG4HPkQrPrVQbfwMzvR3ZPBgWxoYJfU0pYow1MSXb8znxNLnoUN3FnOFxGh3YNdzbFYaS7gbrTL9Uj2EIqDzQeVOt13erORvroiLaN4BYVMsSrupP5opDbFLnZjJ91kIs9Ma/nZluBkucVRCBEPsarN0QkCk= 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) header.from= 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 1622619489652509.3221736002521; Wed, 2 Jun 2021 00:38:09 -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-217-jODGCMiONx--uM97IaTBow-1; Wed, 02 Jun 2021 03:38:05 -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 2DCD9106BB2A; Wed, 2 Jun 2021 07:37:59 +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 D7CFB6A03D; Wed, 2 Jun 2021 07:37:58 +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 0B92E1801264; Wed, 2 Jun 2021 07:37:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1527boDb021064 for ; Wed, 2 Jun 2021 03:37:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id EBFF75C230; Wed, 2 Jun 2021 07:37:50 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.251]) by smtp.corp.redhat.com (Postfix) with ESMTP id 707CD5C67A for ; Wed, 2 Jun 2021 07:37:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622619488; 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=ALYqXgDPrH3LaZE3Bgou40UzriznJ6BUZCELgv0A5ps=; b=Gxt1dD16vIg7X2hZIg5PQ6b+qBZAyND3LBzWVXvrysC88FoyCFWhPQf64uiHWXcNG1ZpsK n1zc0p1uRBgXnJBkn/ZNUreK2Q7FLX8nTsg0VU8/uto+Hv5ac1pEve8fN0pOgBteb3zOOx b/0CJsKVmfJyEypHapk5YB3FMLlBHKk= X-MC-Unique: jODGCMiONx--uM97IaTBow-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/4] node_device_udev: Make udevGenerateDeviceName() return void Date: Wed, 2 Jun 2021 09:37:40 +0200 Message-Id: <408e1e220caea67a3047ca64da4c45ec33b93835.1622619418.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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" This function can't fail really as it's returning 0 no matter what. This is probably a residue from old days when we cared about propagating OOM errors. Now we just abort. Make its return type void then. Signed-off-by: Michal Privoznik --- src/node_device/node_device_udev.c | 52 ++++++++++-------------------- 1 file changed, 17 insertions(+), 35 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index 658170a767..d5f3beb389 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -319,7 +319,7 @@ udevGetUint64SysfsAttr(struct udev_device *udev_device, } =20 =20 -static int +static void udevGenerateDeviceName(struct udev_device *device, virNodeDeviceDef *def, const char *s) @@ -327,8 +327,6 @@ udevGenerateDeviceName(struct udev_device *device, nodeDeviceGenerateName(def, udev_device_get_subsystem(device), udev_device_get_sysname(device), s); - - return 0; } =20 static virMutex pciaccessMutex =3D VIR_MUTEX_INITIALIZER; @@ -410,8 +408,7 @@ udevProcessPCI(struct udev_device *device, goto cleanup; } =20 - if (udevGenerateDeviceName(device, def, NULL) !=3D 0) - goto cleanup; + udevGenerateDeviceName(device, def, NULL); =20 /* The default value is -1, because it can't be 0 * as zero is valid node number. */ @@ -493,8 +490,7 @@ udevProcessDRMDevice(struct udev_device *device, virNodeDevCapDRM *drm =3D &def->caps->data.drm; int minor; =20 - if (udevGenerateDeviceName(device, def, NULL) !=3D 0) - return -1; + udevGenerateDeviceName(device, def, NULL); =20 if (udevGetIntProperty(device, "MINOR", &minor, 10) < 0) return -1; @@ -544,8 +540,7 @@ udevProcessUSBDevice(struct udev_device *device, &usb_dev->product_name) < 0) return -1; =20 - if (udevGenerateDeviceName(device, def, NULL) !=3D 0) - return -1; + udevGenerateDeviceName(device, def, NULL); =20 return 0; } @@ -573,8 +568,7 @@ udevProcessUSBInterface(struct udev_device *device, &usb_if->protocol, 16) < 0) return -1; =20 - if (udevGenerateDeviceName(device, def, NULL) !=3D 0) - return -1; + udevGenerateDeviceName(device, def, NULL); =20 return 0; } @@ -605,8 +599,7 @@ udevProcessNetworkInterface(struct udev_device *device, if (udevGetUintSysfsAttr(device, "addr_len", &net->address_len, 0) < 0) return -1; =20 - if (udevGenerateDeviceName(device, def, net->address) !=3D 0) - return -1; + udevGenerateDeviceName(device, def, net->address); =20 if (virNetDevGetLinkInfo(net->ifname, &net->lnk) < 0) return -1; @@ -638,8 +631,7 @@ udevProcessSCSIHost(struct udev_device *device G_GNUC_U= NUSED, =20 virNodeDeviceGetSCSIHostCaps(&def->caps->data.scsi_host); =20 - if (udevGenerateDeviceName(device, def, NULL) !=3D 0) - return -1; + udevGenerateDeviceName(device, def, NULL); =20 return 0; } @@ -658,8 +650,7 @@ udevProcessSCSITarget(struct udev_device *device, =20 virNodeDeviceGetSCSITargetCaps(def->sysfs_path, &def->caps->data.scsi_= target); =20 - if (udevGenerateDeviceName(device, def, NULL) !=3D 0) - return -1; + udevGenerateDeviceName(device, def, NULL); =20 return 0; } @@ -755,8 +746,7 @@ udevProcessSCSIDevice(struct udev_device *device G_GNUC= _UNUSED, goto cleanup; } =20 - if (udevGenerateDeviceName(device, def, NULL) !=3D 0) - goto cleanup; + udevGenerateDeviceName(device, def, NULL); =20 ret =3D 0; =20 @@ -1008,8 +998,7 @@ udevProcessStorage(struct udev_device *device, goto cleanup; } =20 - if (udevGenerateDeviceName(device, def, storage->serial) !=3D 0) - goto cleanup; + udevGenerateDeviceName(device, def, storage->serial); =20 cleanup: VIR_DEBUG("Storage ret=3D%d", ret); @@ -1025,8 +1014,7 @@ udevProcessSCSIGeneric(struct udev_device *dev, !def->caps->data.sg.path) return -1; =20 - if (udevGenerateDeviceName(dev, def, NULL) !=3D 0) - return -1; + udevGenerateDeviceName(dev, def, NULL); =20 return 0; } @@ -1068,8 +1056,7 @@ udevProcessMediatedDevice(struct udev_device *dev, if ((iommugrp =3D virMediatedDeviceGetIOMMUGroupNum(data->uuid)) < 0) goto cleanup; =20 - if (udevGenerateDeviceName(dev, def, NULL) !=3D 0) - goto cleanup; + udevGenerateDeviceName(dev, def, NULL); =20 data->iommuGroupNumber =3D iommugrp; =20 @@ -1114,8 +1101,7 @@ udevProcessCCW(struct udev_device *device, if (udevGetCCWAddress(def->sysfs_path, &def->caps->data) < 0) return -1; =20 - if (udevGenerateDeviceName(device, def, NULL) !=3D 0) - return -1; + udevGenerateDeviceName(device, def, NULL); =20 return 0; } @@ -1134,8 +1120,7 @@ udevProcessCSS(struct udev_device *device, if (udevGetCCWAddress(def->sysfs_path, &def->caps->data) < 0) return -1; =20 - if (udevGenerateDeviceName(device, def, NULL) !=3D 0) - return -1; + udevGenerateDeviceName(device, def, NULL); =20 if (virNodeDeviceGetCSSDynamicCaps(def->sysfs_path, &def->caps->data.c= cw_dev) < 0) return -1; @@ -1181,8 +1166,7 @@ static int udevProcessVDPA(struct udev_device *device, virNodeDeviceDef *def) { - if (udevGenerateDeviceName(device, def, NULL) !=3D 0) - return -1; + udevGenerateDeviceName(device, def, NULL); =20 if (udevGetVDPACharDev(def->sysfs_path, &def->caps->data) < 0) return -1; @@ -1209,8 +1193,7 @@ udevProcessAPCard(struct udev_device *device, return -1; } =20 - if (udevGenerateDeviceName(device, def, NULL) !=3D 0) - return -1; + udevGenerateDeviceName(device, def, NULL); =20 return 0; } @@ -1235,8 +1218,7 @@ udevProcessAPQueue(struct udev_device *device, return -1; } =20 - if (udevGenerateDeviceName(device, def, NULL) !=3D 0) - return -1; + udevGenerateDeviceName(device, def, NULL); =20 return 0; } --=20 2.31.1