From nobody Sun Feb 8 22:58:14 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 1531277561110933.1544629055117; Tue, 10 Jul 2018 19:52:41 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6A204356D5; Wed, 11 Jul 2018 02:52: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 2C5C15D755; Wed, 11 Jul 2018 02:52: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 D1D3724F63; Wed, 11 Jul 2018 02:52:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6B2qScP026122 for ; Tue, 10 Jul 2018 22:52:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 859CF20180F2; Wed, 11 Jul 2018 02:52:28 +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 70EBA2026D6B; Wed, 11 Jul 2018 02:52:25 +0000 (UTC) From: Han Han To: libvir-list@redhat.com Date: Wed, 11 Jul 2018 10:52:07 +0800 Message-Id: <20180711025207.12842-3-hhan@redhat.com> In-Reply-To: <20180711025207.12842-1-hhan@redhat.com> References: <20180711025207.12842-1-hhan@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 11 Jul 2018 02:52:40 +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