From nobody Tue Apr 23 23:25:14 2024 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 1531278512495149.0124745080533; Tue, 10 Jul 2018 20:08:32 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F0B3530E6846; Wed, 11 Jul 2018 03:08:30 +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 B16F319483; Wed, 11 Jul 2018 03:08:30 +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 642FE18037F1; Wed, 11 Jul 2018 03:08:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6B38MjK027416 for ; Tue, 10 Jul 2018 23:08:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8AA05111AF34; Wed, 11 Jul 2018 03:08:22 +0000 (UTC) Received: from hansolo.nay.redhat.com (wlan-69-196.nay.redhat.com [10.66.69.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE624111AF30; Wed, 11 Jul 2018 03:08:20 +0000 (UTC) From: Han Han To: libvir-list@redhat.com Date: Wed, 11 Jul 2018 11:07:52 +0800 Message-Id: <20180711030753.14967-2-hhan@redhat.com> In-Reply-To: <20180711030753.14967-1-hhan@redhat.com> References: <20180711030753.14967-1-hhan@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, Han Han Subject: [libvirt] [PATCH 1/2] util: Refactor virFileIsCDROM to virFileCheckCDROM 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.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Wed, 11 Jul 2018 03:08:31 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add enum type of cdrom statuses. Add argument cd_status in virFileCheckCDROM to store cdrom status. Now virFileCheckCDROM could be used to check the cdrom drive status such as no info, no disc, trey open, drive not ready or ok. Signed-off-by: Han Han --- src/libvirt_private.syms | 2 +- src/qemu/qemu_domain.c | 4 ++-- src/util/virfile.c | 44 ++++++++++++++++++++++++++++++++++------ src/util/virfile.h | 11 +++++++++- 4 files changed, 51 insertions(+), 10 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e688981c3e..b03e1f15a7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1811,7 +1811,7 @@ virFileGetMountSubtree; virFileHasSuffix; virFileInData; virFileIsAbsPath; -virFileIsCDROM; +virFileCheckCDROM; virFileIsDir; virFileIsExecutable; virFileIsLink; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ed76495309..f443eb4d8f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7487,7 +7487,7 @@ void qemuDomainObjCheckDiskTaint(virQEMUDriverPtr dri= ver, =20 if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM && virStorageSourceGetActualType(disk->src) =3D=3D VIR_STORAGE_TYPE_B= LOCK && - disk->src->path && virFileIsCDROM(disk->src->path) =3D=3D 1) + disk->src->path && virFileCheckCDROM(disk->src->path, NULL) =3D=3D= 1) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_CDROM_PASSTHROUGH, logCtxt); =20 @@ -8394,7 +8394,7 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr driver, if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM && src->format =3D=3D VIR_STORAGE_FILE_RAW && virStorageSourceIsBlockLocal(src) && - virFileIsCDROM(src->path) =3D=3D 1) + virFileCheckCDROM(src->path, NULL) =3D=3D 1) src->hostcdrom =3D true; =20 ret =3D 0; diff --git a/src/util/virfile.c b/src/util/virfile.c index 378d03ecf0..a2199e6a97 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1990,19 +1990,21 @@ int virFileIsMountPoint(const char *file) =20 #if defined(__linux__) /** - * virFileIsCDROM: + * virFileCheckCDROM: * @path: File to check + * @cd_status: Ptr to store CDROM status; Not to store status if NULL * * Returns 1 if @path is a cdrom device 0 if it is not a cdrom and -1 on * error. 'errno' of the failure is preserved and no libvirt errors are * reported. */ int -virFileIsCDROM(const char *path) +virFileCheckCDROM(const char *path, int *cd_status) { struct stat st; int fd; int ret =3D -1; + int *status; =20 if ((fd =3D open(path, O_RDONLY | O_NONBLOCK)) < 0) goto cleanup; @@ -2016,10 +2018,40 @@ virFileIsCDROM(const char *path) } =20 /* Attempt to detect via a CDROM specific ioctl */ - if (ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) >=3D 0) - ret =3D 1; - else + *status =3D ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT); + + if (cd_status =3D=3D NULL) { + if (*status >=3D 0) + ret =3D 1; + else + ret =3D 0; + goto cleanup; + } + + if (*status < 0) { ret =3D 0; + goto cleanup; + } + + switch (*status) { + case CDS_NO_INFO: + *cd_status =3D VIR_FILE_CDROM_NO_INFO; + break; + case CDS_NO_DISC: + *cd_status =3D VIR_FILE_CDROM_NO_DISC; + break; + case CDS_TRAY_OPEN: + *cd_status =3D VIR_FILE_CDROM_TREY_OPEN; + break; + case CDS_DRIVE_NOT_READY: + *cd_status =3D VIR_FILE_CDROM_DRIVE_NOT_READY; + break; + case CDS_DISC_OK: + *cd_status =3D VIR_FILE_CDROM_DISC_OK; + break; + } + + ret =3D 1; =20 cleanup: VIR_FORCE_CLOSE(fd); @@ -2029,7 +2061,7 @@ virFileIsCDROM(const char *path) #else =20 int -virFileIsCDROM(const char *path) +virFileCheckCDROM(const char *path, int *cd_status) { if (STRPREFIX(path, "/dev/cd") || STRPREFIX(path, "/dev/acd")) diff --git a/src/util/virfile.h b/src/util/virfile.h index 6f1e802fde..e06ccd8f9f 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -210,7 +210,16 @@ enum { int virFileIsSharedFSType(const char *path, int fstypes) ATTRIBUTE_NONNULL= (1); int virFileIsSharedFS(const char *path) ATTRIBUTE_NONNULL(1); int virFileIsMountPoint(const char *file) ATTRIBUTE_NONNULL(1); -int virFileIsCDROM(const char *path) + +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, +}; + +int virFileCheckCDROM(const char *path) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; =20 int virFileGetMountSubtree(const char *mtabpath, --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 23 23:25:14 2024 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 1531278528113207.87855227274213; Tue, 10 Jul 2018 20:08:48 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8444B308FB9B; Wed, 11 Jul 2018 03:08:46 +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 4EC5830012C2; Wed, 11 Jul 2018 03:08:46 +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 E90ED18037F2; Wed, 11 Jul 2018 03:08:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6B38PoC027436 for ; Tue, 10 Jul 2018 23:08:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 90AFE111AF34; Wed, 11 Jul 2018 03:08:25 +0000 (UTC) Received: from hansolo.nay.redhat.com (wlan-69-196.nay.redhat.com [10.66.69.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79191111AF30; Wed, 11 Jul 2018 03:08:23 +0000 (UTC) From: Han Han To: libvir-list@redhat.com Date: Wed, 11 Jul 2018 11:07:53 +0800 Message-Id: <20180711030753.14967-3-hhan@redhat.com> In-Reply-To: <20180711030753.14967-1-hhan@redhat.com> References: <20180711030753.14967-1-hhan@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, 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.84 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Wed, 11 Jul 2018 03:08:47 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Implement virFileCheckCDROM in virStorageBackendVolOpen to check if cdrom backend is ready. Skip the error of cdrom not ready. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1596096 Signed-off-by: Han Han --- src/storage/storage_util.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index da99043e0a..38a91541fd 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -1506,7 +1506,7 @@ int virStorageBackendVolOpen(const char *path, struct stat *sb, unsigned int flags) { - int fd, mode =3D 0; + int fd, cd_status, mode =3D 0; char *base =3D last_component(path); bool noerror =3D (flags & VIR_STORAGE_VOL_OPEN_NOERROR); =20 @@ -1545,6 +1545,19 @@ virStorageBackendVolOpen(const char *path, struct st= at *sb, return -1; } =20 + if (virFileCheckCDROM(path, &cd_status)) { + if (cd_status !=3D VIR_FILE_CDROM_DISC_OK) { + if (noerror) { + VIR_WARN("ignoring CDROM %s is not ready", path); + return -2; + } + virReportError(VIR_ERR_INTERNAL_ERROR, + _("CDROM %s is not ready", path); + return -1; + } + VIR_INFO("CDROM backend %s 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