CVSROOT: /sources/qemu Module name: qemu Changes by: Fabrice Bellard <bellard> 06/06/14 16:03:05
Modified files: . : qemu-doc.texi vl.c vl.h hw : pc.c Log message: -no-fd-bootchk option (Lonnie Mendez) CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/qemu/qemu-doc.texi?cvsroot=qemu&r1=1.92&r2=1.93 http://cvs.savannah.gnu.org/viewcvs/qemu/vl.c?cvsroot=qemu&r1=1.187&r2=1.188 http://cvs.savannah.gnu.org/viewcvs/qemu/vl.h?cvsroot=qemu&r1=1.127&r2=1.128 http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pc.c?cvsroot=qemu&r1=1.58&r2=1.59 Patches: Index: qemu-doc.texi =================================================================== RCS file: /sources/qemu/qemu/qemu-doc.texi,v retrieving revision 1.92 retrieving revision 1.93 diff -u -b -r1.92 -r1.93 --- qemu-doc.texi 14 Jun 2006 12:36:31 -0000 1.92 +++ qemu-doc.texi 14 Jun 2006 16:03:05 -0000 1.93 @@ -228,6 +228,10 @@ the raw disk image you use is not written back. You can however force the write back by pressing @key{C-a s} (@pxref{disk_images}). [EMAIL PROTECTED] -no-fd-bootchk +Disable boot signature checking for floppy disks in Bochs BIOS. It may +be needed to boot from old floppy disks. + @item -m megs Set virtual RAM size to @var{megs} megabytes. Default is 128 MB. Index: vl.c =================================================================== RCS file: /sources/qemu/qemu/vl.c,v retrieving revision 1.187 retrieving revision 1.188 diff -u -b -r1.187 -r1.188 --- vl.c 25 May 2006 23:58:51 -0000 1.187 +++ vl.c 14 Jun 2006 16:03:05 -0000 1.188 @@ -159,6 +159,7 @@ #define MAX_CPUS 1 #endif int acpi_enabled = 1; +int fd_bootchk = 1; /***********************************************************/ /* x86 ISA bus support */ @@ -4634,6 +4635,9 @@ "-cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master)\n" "-boot [a|c|d] boot on floppy (a), hard disk (c) or CD-ROM (d)\n" "-snapshot write to temporary files instead of disk image files\n" +#ifdef TARGET_I386 + "-no-fd-bootchk disable boot signature checking for floppy disks\n" +#endif "-m megs set virtual RAM size to megs MB [default=%d]\n" "-smp n set the number of CPUs to 'n' [default=1]\n" "-nographic disable graphical output and redirect serial I/Os to console\n" @@ -4765,6 +4769,9 @@ QEMU_OPTION_cdrom, QEMU_OPTION_boot, QEMU_OPTION_snapshot, +#ifdef TARGET_I386 + QEMU_OPTION_no_fd_bootchk, +#endif QEMU_OPTION_m, QEMU_OPTION_nographic, #ifdef HAS_AUDIO @@ -4828,6 +4835,9 @@ { "cdrom", HAS_ARG, QEMU_OPTION_cdrom }, { "boot", HAS_ARG, QEMU_OPTION_boot }, { "snapshot", 0, QEMU_OPTION_snapshot }, +#ifdef TARGET_I386 + { "no-fd-bootchk", 0, QEMU_OPTION_no_fd_bootchk }, +#endif { "m", HAS_ARG, QEMU_OPTION_m }, { "nographic", 0, QEMU_OPTION_nographic }, { "k", HAS_ARG, QEMU_OPTION_k }, @@ -5286,6 +5296,11 @@ case QEMU_OPTION_fdb: fd_filename[1] = optarg; break; +#ifdef TARGET_I386 + case QEMU_OPTION_no_fd_bootchk: + fd_bootchk = 0; + break; +#endif case QEMU_OPTION_no_code_copy: code_copy_enabled = 0; break; Index: vl.h =================================================================== RCS file: /sources/qemu/qemu/vl.h,v retrieving revision 1.127 retrieving revision 1.128 diff -u -b -r1.127 -r1.128 --- vl.h 14 Jun 2006 15:50:07 -0000 1.127 +++ vl.h 14 Jun 2006 16:03:05 -0000 1.128 @@ -889,6 +889,7 @@ /* pc.c */ extern QEMUMachine pc_machine; extern QEMUMachine isapc_machine; +extern int fd_bootchk; void ioport_set_a20(int enable); int ioport_get_a20(void); Index: hw/pc.c =================================================================== RCS file: /sources/qemu/qemu/hw/pc.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -b -r1.58 -r1.59 --- hw/pc.c 30 May 2006 01:48:12 -0000 1.58 +++ hw/pc.c 14 Jun 2006 16:03:05 -0000 1.59 @@ -193,6 +193,8 @@ case 'a': case 'b': rtc_set_memory(s, 0x3d, 0x01); /* floppy boot */ + if (!fd_bootchk) + rtc_set_memory(s, 0x38, 0x01); /* disable signature check */ break; default: case 'c': @@ -264,10 +266,6 @@ } } rtc_set_memory(s, 0x39, val); - - /* Disable check of 0x55AA signature on the last two bytes of - first sector of disk. XXX: make it the default ? */ - // rtc_set_memory(s, 0x38, 1); } void ioport_set_a20(int enable) _______________________________________________ Qemu-devel mailing list Qemu-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/qemu-devel