From nobody Tue May 13 15:11:35 2025 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 1530584992763464.785686947409; Mon, 2 Jul 2018 19:29:52 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 43317C049DFD; Tue, 3 Jul 2018 02:29:51 +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 0F36A60175; Tue, 3 Jul 2018 02:29:51 +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 93EEF18037ED; Tue, 3 Jul 2018 02:29:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w632TmNA029835 for ; Mon, 2 Jul 2018 22:29:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5F64F1C596; Tue, 3 Jul 2018 02:29:48 +0000 (UTC) Received: from hansolo.nay.redhat.com (unknown [10.66.4.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B40C178B7; Tue, 3 Jul 2018 02:29:46 +0000 (UTC) From: Han Han To: libvir-list@redhat.com Date: Tue, 3 Jul 2018 10:29:38 +0800 Message-Id: <20180703022939.7672-2-hhan@redhat.com> In-Reply-To: <20180703022939.7672-1-hhan@redhat.com> References: <20180703022939.7672-1-hhan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Han Han Subject: [libvirt] [PATCH 1/2] util: Introduce virFileCdromStatus 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 03 Jul 2018 02:29:51 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This private API helps check cdrom drive status via ioctl(). Signed-off-by: Han Han --- src/libvirt_private.syms | 1 + src/util/virfile.c | 52 ++++++++++++++++++++++++++++++++++++++++ src/util/virfile.h | 10 ++++++++ 3 files changed, 63 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5499a368c0..e9f79ad433 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1797,6 +1797,7 @@ virFileActivateDirOverride; virFileBindMountDevice; virFileBuildPath; virFileCanonicalizePath; +virFileCdromStatus; virFileChownFiles; virFileClose; virFileComparePaths; diff --git a/src/util/virfile.c b/src/util/virfile.c index 378d03ecf0..790d9448d2 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2026,6 +2026,58 @@ virFileIsCDROM(const char *path) return ret; } =20 +/** + * virFileCdromStatus: + * @path: Cdrom path + * + * Returns: + * -1 error happends. + * VIR_FILE_CDROM_DISC_OK Cdrom is OK. + * VIR_FILE_CDROM_NO_INFO Information not available. + * VIR_FILE_CDROM_NO_DISC No disc in cdrom. + * VIR_FILE_CDROM_TREY_OPEN Cdrom is trey-open. + * VIR_FILE_CDROM_DRIVE_NOT_READY Cdrom is not ready. + * reported. + */ +int +virFileCdromStatus(const char *path) +{ + int ret =3D -1; + int fd; + + if ((fd =3D open(path, O_RDONLY | O_NONBLOCK)) < 0) + goto cleanup; + + /* Attempt to detect CDROM status via ioctl */ + if ((ret =3D ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT)) >=3D 0) { + switch (ret) { + case CDS_NO_INFO: + ret =3D VIR_FILE_CDROM_NO_INFO; + goto cleanup; + break; + case CDS_NO_DISC: + ret =3D VIR_FILE_CDROM_NO_DISC; + goto cleanup; + break; + case CDS_TRAY_OPEN: + ret =3D VIR_FILE_CDROM_TREY_OPEN; + goto cleanup; + break; + case CDS_DRIVE_NOT_READY: + ret =3D VIR_FILE_CDROM_DRIVE_NOT_READY; + goto cleanup; + break; + case CDS_DISC_OK: + ret =3D VIR_FILE_CDROM_DISC_OK; + goto cleanup; + break; + } + } + + cleanup: + VIR_FORCE_CLOSE(fd); + return ret; +} #else =20 int diff --git a/src/util/virfile.h b/src/util/virfile.h index 6f1e802fde..9d4701c8d2 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -212,6 +212,16 @@ int virFileIsSharedFS(const char *path) ATTRIBUTE_NONN= ULL(1); int virFileIsMountPoint(const char *file) ATTRIBUTE_NONNULL(1); int virFileIsCDROM(const char *path) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; +int virFileCdromStatus(const char *path) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + +enum { + VIR_FILE_CDROM_DISC_OK =3D 1, + VIR_FILE_CDROM_NO_INFO, + VIR_FILE_CDROM_NO_DISC, + VIR_FILE_CDROM_TREY_OPEN, + VIR_FILE_CDROM_DRIVE_NOT_READY, +}; =20 int virFileGetMountSubtree(const char *mtabpath, const char *prefix, --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue May 13 15:11:35 2025 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 15305851006731005.0882278912547; Mon, 2 Jul 2018 19:31:40 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 383B281DEC; Tue, 3 Jul 2018 02:31:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 046B060175; Tue, 3 Jul 2018 02:31:39 +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 8281E4A460; Tue, 3 Jul 2018 02:31:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w632Topp029845 for ; Mon, 2 Jul 2018 22:29:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 48ED81C596; Tue, 3 Jul 2018 02:29:50 +0000 (UTC) Received: from hansolo.nay.redhat.com (unknown [10.66.4.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id 05B43178B7; Tue, 3 Jul 2018 02:29:48 +0000 (UTC) From: Han Han To: libvir-list@redhat.com Date: Tue, 3 Jul 2018 10:29:39 +0800 Message-Id: <20180703022939.7672-3-hhan@redhat.com> In-Reply-To: <20180703022939.7672-1-hhan@redhat.com> References: <20180703022939.7672-1-hhan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Han Han Subject: [libvirt] [PATCH 2/2] storage: Improve error handling on cdrom backend 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 03 Jul 2018 02:31:39 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Implement virFileCdromStatus() in virStorageBackendVolOpen to show detailed errors or warnings of cdrom instead of general Input/output error. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1596096 Signed-off-by: Han Han --- src/storage/storage_util.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index a701a75702..5a7ed4c76f 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -1538,6 +1538,44 @@ virStorageBackendVolOpen(const char *path, struct st= at *sb, return -1; } =20 + if (virFileIsCDROM(path) =3D=3D 1) { + switch (virFileCdromStatus(path)) { + case VIR_FILE_CDROM_NO_INFO : + if (noerror) { + VIR_WARN("ignoring unavailable information of %s", pat= h); + return -2; + } + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cdrom %s information is unavailable"), p= ath); + return -1; + case VIR_FILE_CDROM_NO_DISC : + if (noerror) { + VIR_WARN("ignoring no disc %s", path); + return -2; + } + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cdrom %s has no disc"), path); + return -1; + case VIR_FILE_CDROM_TREY_OPEN : + if (noerror) { + VIR_WARN("ignoring trey open of %s", path); + return -2; + } + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cdrom %s is on trey-open status"), path); + return -1; + case VIR_FILE_CDROM_DRIVE_NOT_READY : + if (noerror) { + VIR_WARN("ignoring %s not ready", path); + return -2; + } + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cdrom %s is on not ready"), path); + return -1; + case VIR_FILE_CDROM_DISC_OK : + VIR_INFO("Cdrom %s status is ok", path); + } + } /* O_NONBLOCK should only matter during open() for fifos and * sockets, which we already filtered; but using it prevents a * TOCTTOU race. However, later on we will want to read() the --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list