Re: [Qemu-devel] qemu qemu-doc.texi vl.c vl.h hw/pc.c hw/sun4m.c
On 1/7/07, Thiemo Seufer [EMAIL PROTECTED] wrote:
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/01/07 20:42:14
Modified files:
. : qemu-doc.texi vl.c vl.h
hw : pc.c sun4m.c
Log message:
Revert -disk patch, as requested by Fabrice. The general idea of
this
patch is sound, but the implementation is just too ugly.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/qemu-doc.texi?cvsroot=qemur1=1.120r2=1.121
http://cvs.savannah.gnu.org/viewcvs/qemu/vl.c?cvsroot=qemur1=1.233r2=1.234
http://cvs.savannah.gnu.org/viewcvs/qemu/vl.h?cvsroot=qemur1=1.165r2=1.166
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pc.c?cvsroot=qemur1=1.65r2=1.66
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/sun4m.c?cvsroot=qemur1=1.22r2=1.23
___
Qemu-devel mailing list
Qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel
That sun4m.c change breaks disk/cdrom attachment to esp scsi.
Please see the patch to make it work again.
--
Kind regards,
Igor V. Kovalenko
Index: hw/sun4m.c
===
RCS file: /cvsroot/qemu/qemu/hw/sun4m.c,v
retrieving revision 1.23
diff -u -r1.23 sun4m.c
--- hw/sun4m.c 7 Jan 2007 20:42:14 - 1.23
+++ hw/sun4m.c 9 Jan 2007 21:23:53 -
@@ -262,6 +262,13 @@
slavio_serial_init(PHYS_JJ_SER, PHYS_JJ_SER_IRQ, serial_hds[1], serial_hds[0]);
fdctrl_init(PHYS_JJ_FLOPPY_IRQ, 0, 1, PHYS_JJ_FDC, fd_table);
main_esp = esp_init(bs_table, PHYS_JJ_ESP, dma);
+
+for (i = 0; i MAX_DISKS; i++) {
+if (bs_table[i]) {
+esp_scsi_attach(main_esp, bs_table[i], i);
+}
+}
+
slavio_misc = slavio_misc_init(PHYS_JJ_SLAVIO, PHYS_JJ_ME_IRQ);
cs_init(PHYS_JJ_CS, PHYS_JJ_CS_IRQ, slavio_intctl);
sparc32_dma_set_reset_data(dma, main_esp, main_lance);
___
Qemu-devel mailing list
Qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel
[Qemu-devel] qemu qemu-doc.texi vl.c vl.h hw/pc.c
CVSROOT:/sources/qemu Module name:qemu Changes by: Thiemo Seufer ths 07/01/05 17:39:04 Modified files: . : qemu-doc.texi vl.c vl.h hw : pc.c Log message: Add -option-rom option to allow loading of PCI option ROMs, by Anthony Liguori. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/qemu/qemu-doc.texi?cvsroot=qemur1=1.118r2=1.119 http://cvs.savannah.gnu.org/viewcvs/qemu/vl.c?cvsroot=qemur1=1.230r2=1.231 http://cvs.savannah.gnu.org/viewcvs/qemu/vl.h?cvsroot=qemur1=1.161r2=1.162 http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pc.c?cvsroot=qemur1=1.64r2=1.65 ___ Qemu-devel mailing list Qemu-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/qemu-devel
[Qemu-devel] qemu qemu-doc.texi vl.c vl.h hw/pc.c
CVSROOT:/sources/qemu Module name:qemu Changes by: Thiemo Seufer ths 06/12/22 16:34:12 Modified files: . : qemu-doc.texi vl.c vl.h hw : pc.c Log message: SCSI emulation improvements, by Chuck Brazie. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/qemu/qemu-doc.texi?cvsroot=qemur1=1.116r2=1.117 http://cvs.savannah.gnu.org/viewcvs/qemu/vl.c?cvsroot=qemur1=1.222r2=1.223 http://cvs.savannah.gnu.org/viewcvs/qemu/vl.h?cvsroot=qemur1=1.158r2=1.159 http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pc.c?cvsroot=qemur1=1.63r2=1.64 ___ Qemu-devel mailing list Qemu-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/qemu-devel
[Qemu-devel] qemu qemu-doc.texi vl.c vl.h hw/pc.c
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=qemur1=1.92r2=1.93
http://cvs.savannah.gnu.org/viewcvs/qemu/vl.c?cvsroot=qemur1=1.187r2=1.188
http://cvs.savannah.gnu.org/viewcvs/qemu/vl.h?cvsroot=qemur1=1.127r2=1.128
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pc.c?cvsroot=qemur1=1.58r2=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 - 1.92
+++ qemu-doc.texi 14 Jun 2006 16:03:05 - 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.c25 May 2006 23:58:51 - 1.187
+++ vl.c14 Jun 2006 16:03:05 - 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.h14 Jun 2006 15:50:07 - 1.127
+++ vl.h14 Jun 2006 16:03:05 - 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 - 1.58
+++ hw/pc.c 14 Jun 2006 16:03:05 - 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
[Qemu-devel] qemu ./qemu-doc.texi ./vl.c ./vl.h hw/pc.c
CVSROOT:/sources/qemu Module name:qemu Branch: Changes by: Fabrice Bellard [EMAIL PROTECTED] 05/12/18 20:34:32 Modified files: . : qemu-doc.texi vl.c vl.h hw : pc.c Log message: suppressed -enable-audio and simplified -soundhw option handling (malc) CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/qemu/qemu/qemu-doc.texi.diff?tr1=1.76tr2=1.77r1=textr2=text http://cvs.savannah.gnu.org/viewcvs/qemu/qemu/vl.c.diff?tr1=1.156tr2=1.157r1=textr2=text http://cvs.savannah.gnu.org/viewcvs/qemu/qemu/vl.h.diff?tr1=1.98tr2=1.99r1=textr2=text http://cvs.savannah.gnu.org/viewcvs/qemu/qemu/hw/pc.c.diff?tr1=1.49tr2=1.50r1=textr2=text ___ Qemu-devel mailing list Qemu-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/qemu-devel
[Qemu-devel] qemu ./qemu-doc.texi ./vl.c ./vl.h hw/pc.c
CVSROOT:/cvsroot/qemu Module name:qemu Branch: Changes by: Fabrice Bellard [EMAIL PROTECTED] 05/11/06 18:20:37 Modified files: . : qemu-doc.texi vl.c vl.h hw : pc.c Log message: suppressed unneeded options - added isapc machine CVSWeb URLs: http://savannah.gnu.org/cgi-bin/viewcvs/qemu/qemu/qemu-doc.texi.diff?tr1=1.68tr2=1.69r1=textr2=text http://savannah.gnu.org/cgi-bin/viewcvs/qemu/qemu/vl.c.diff?tr1=1.141tr2=1.142r1=textr2=text http://savannah.gnu.org/cgi-bin/viewcvs/qemu/qemu/vl.h.diff?tr1=1.86tr2=1.87r1=textr2=text http://savannah.gnu.org/cgi-bin/viewcvs/qemu/qemu/hw/pc.c.diff?tr1=1.44tr2=1.45r1=textr2=text ___ Qemu-devel mailing list Qemu-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/qemu-devel
