From nobody Sat Feb 7 15:12:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1554209030889140.6439512099479; Tue, 2 Apr 2019 05:43:50 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C7A2A30992DD; Tue, 2 Apr 2019 12:43:49 +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 9BB361001DF1; Tue, 2 Apr 2019 12:43:49 +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 5BCFB180338C; Tue, 2 Apr 2019 12:43:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x32CeohZ008789 for ; Tue, 2 Apr 2019 08:40:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 458A068403; Tue, 2 Apr 2019 12:40:50 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB3EB6A4B6; Tue, 2 Apr 2019 12:40:46 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Tue, 2 Apr 2019 13:40:34 +0100 Message-Id: <20190402124036.2415-3-berrange@redhat.com> In-Reply-To: <20190402124036.2415-1-berrange@redhat.com> References: <20190402124036.2415-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/4] qemu: don't rely on the non-portable d_type field in dirent 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 02 Apr 2019 12:43:50 +0000 (UTC) d_type is a non-portable extension to the struct dirent and even if it exists, its value may be DT_UNKNOWN if the filesystem doesn't support it. This is common with older versions of XFS which have ftype=3D0 feature. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_firmware.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 4ce010caaa..787b76b531 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -924,9 +924,7 @@ qemuFirmwareBuildFileList(virHashTablePtr files, const = char *dir) while ((rc =3D virDirRead(dirp, &ent, dir)) > 0) { VIR_AUTOFREE(char *) filename =3D NULL; VIR_AUTOFREE(char *) path =3D NULL; - - if (ent->d_type !=3D DT_REG && ent->d_type !=3D DT_LNK) - continue; + struct stat sb; =20 if (STRPREFIX(ent->d_name, ".")) continue; @@ -937,6 +935,14 @@ qemuFirmwareBuildFileList(virHashTablePtr files, const= char *dir) if (virAsprintf(&path, "%s/%s", dir, filename) < 0) goto cleanup; =20 + if (stat(path, &sb) < 0) { + virReportSystemError(errno, _("Unable to access %s"), path); + goto cleanup; + } + + if (!S_ISREG(sb.st_mode) && !S_ISLNK(sb.st_mode)) + continue; + if (virHashUpdateEntry(files, filename, path) < 0) goto cleanup; =20 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list