floppy driver and multiple floppies (was Re: 2.6.0 under vmware ?)

[Petr Vandrovec <vandrove@vc.cvut.cz>]

On Mon, Jan 05, 2004 at 04:20:32PM +0200, Ville Herva wrote:
> On Mon, Jan 05, 2004 at 11:06:43AM +0100, you [Xavier Bestel] wrote:
> > Hi,
> > 
> > Has anyone managed to make another distro with 2.6 work under vmware ?
> 
> 2.6.1rc1 works great for me under vmware 4.05 (6030), but that's with an
> ancient glibc and /sbin/init that do not know of sysenter among other
> things.
> 
> There is one regression, though: 2.2.x and 2.4.x can see /dev/fd0 and
> /dev/fd1 under vmware. 2.6.1rc1 only find /dev/fd0. Does anyone else see
> this?

Are you sure that VMware is a culprit? I had to apply patch below to get
floppy option to work at all (otherwise buggy kernel options parser which
does not understand quotes comes in a way making it impossible to do
f.e. "floppy=1,6,cmos").

And even then configuration with more than one floppy drive is broken:
all floppies will use same queue, but it is not allowed - there is even
comment in the code saying "to be cleaned up" before add_disk() call,
and from my understanding there must be 1:1 relation between queues
and registered disks. Otherwise (at least) sysfs breaks and will
crash on floppy unload as queue is deleted twice from sysfs, and it does not 
like doing such things...
						Petr Vandrovec
						vandrove@vc.cvut.cz

 
diff -urdN linux/drivers/block/floppy.c linux/drivers/block/floppy.c
--- linux/drivers/block/floppy.c	2003-12-31 02:59:44.000000000 +0100
+++ linux/drivers/block/floppy.c	2003-12-31 14:14:21.000000000 +0100
@@ -150,6 +150,7 @@
 /* do print messages for unexpected interrupts */
 static int print_unex=1;
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/sched.h>
 #include <linux/fs.h>
 #include <linux/kernel.h>
@@ -4618,9 +4619,9 @@
 	wait_for_completion(&device_release);
 }
 
-MODULE_PARM(floppy,"s");
-MODULE_PARM(FLOPPY_IRQ,"i");
-MODULE_PARM(FLOPPY_DMA,"i");
+module_param(floppy, charp, 0);
+module_param(FLOPPY_IRQ, int, 0);
+module_param(FLOPPY_DMA, int, 0);
 MODULE_AUTHOR("Alain L. Knaff");
 MODULE_SUPPORTED_DEVICE("fd");
 MODULE_LICENSE("GPL");