From owner-freebsd-current  Sun Jan 30 23:30:23 2000
Delivered-To: freebsd-current@freebsd.org
Received: from quack.kfu.com (quack.kfu.com [170.1.70.2])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0B62E14D61; Sun, 30 Jan 2000 23:30:19 -0800 (PST)
	(envelope-from nsayer@quack.kfu.com)
Received: from icarus.kfu.com (icarus.kfu.com [170.1.70.17])
	by quack.kfu.com (8.9.2/8.9.3) with ESMTP id XAA99993;
	Sun, 30 Jan 2000 23:30:15 -0800 (PST)
	(envelope-from nsayer@quack.kfu.com)
Received: from quack.kfu.com by icarus.kfu.com  with ESMTP
        (8.9.3//ident-1.0) id XAA10901; Sun, 30 Jan 2000 23:30:10 -0800 (PST) 
Message-ID: <38953A01.D801778@quack.kfu.com>
Date: Mon, 31 Jan 2000 07:30:09 +0000
From: Nick Sayer <nsayer@quack.kfu.com>
Reply-To: nsayer@freebsd.org
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.0.36 i386)
X-Accept-Language: en
MIME-Version: 1.0
To: freebsd-emulation@freebsd.org, freebsd-current@freebsd.org
Subject: VMware & SCSI CDROM - fix
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

This fixes the error messages seen when attempting to use a SCSI cdrom
drive with
vmware. It is unclear to me whether this would do more harm than good,
since I don't
really know what the CDIOCREADSUBCHANNEL ioctl does. But it does look
righteous to me,
since without it, the 'track' variable in the bsdsc will be not be
initialized prior to
the fo_ioctl().

I can commit this if it would be easiest, though I think someone who
knows this area
better than me should comment first. :-)


--- sys/i386/linux/linux_ioctl.c.orig  Sun Jan 30 23:09:11 2000
+++ sys/i386/linux/linux_ioctl.c       Sun Jan 30 22:56:07 2000
@@ -890,6 +890,7 @@
                    sizeof(struct cd_sub_channel_info));
                bsdsc.address_format = CD_LBA_FORMAT;
                bsdsc.data_format = CD_CURRENT_POSITION;
+               bsdsc.track = 0;
                bsdsc.data_len = sizeof(struct cd_sub_channel_info);
                bsdsc.data = bsdinfo;
                error = fo_ioctl(fp, CDIOCREADSUBCHANNEL,
(caddr_t)&bsdsc, p);


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message