Index: vl.c
===================================================================
RCS file: /cvsroot/qemu/qemu/vl.c,v
retrieving revision 1.126
diff -u -r1.126 vl.c
--- vl.c	7 Apr 2005 22:20:28 -0000	1.126
+++ vl.c	12 Apr 2005 16:28:26 -0000
@@ -3196,7 +3196,16 @@
                 has_cdrom = 1;
                 break;
             case QEMU_OPTION_boot:
-                boot_device = optarg[0];
+		if (!strncasecmp(optarg, "fd", 2) || !strcasecmp(optarg, "floppy"))
+		    boot_device = 'a';
+		else if (!strncasecmp(optarg, "hd", 2) || !strcasecmp(optarg, "disk"))
+		    boot_device = 'c';
+		else if (!strncasecmp(optarg, "cd", 2) || !strcasecmp(optarg, "cdrom"))
+		    boot_device = 'd';
+		else if (!strcasecmp(optarg, "net") || !strcasecmp(optarg, "network"))
+		    boot_device = 'n';
+		else
+        	    boot_device = optarg[0];
                 if (boot_device != 'a' && 
 #ifdef TARGET_SPARC
 		    // Network boot