From 0f7eece141e2fc2aa5100b06b5de1b05bed046f7 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 6 Aug 2019 21:08:35 +0200 Subject: [PATCH] Meta: Make Serenity run on Bochs once again It's now possible to run Serenity inside Bochs by executing "./run b" Note that it only works with a GRUB image (i.e ./build-image-grub.sh) --- Kernel/.bochsrc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Kernel/.bochsrc b/Kernel/.bochsrc index fd215498d8..cc4df97a05 100644 --- a/Kernel/.bochsrc +++ b/Kernel/.bochsrc @@ -4,12 +4,12 @@ display_library: x memory: host=128, guest=128 romimage: file="/usr/share/bochs/BIOS-bochs-latest", address=0x00000000, options=none vgaromimage: file="/usr/share/bochs/VGABIOS-lgpl-latest" -boot: floppy -floppy_bootsig_check: disabled=0 -floppya: type=1_44, 1_44=".floppy-image", status=inserted, write_protected=0 +boot: disk +#floppy_bootsig_check: disabled=0 +#floppya: type=1_44, 1_44=".floppy-image", status=inserted, write_protected=0 # no floppyb ata0: enabled=true, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14 -ata0-master: type=disk, path="_fs_contents", mode=flat, cylinders=0, heads=0, spt=0, model="Generic 1234", biosdetect=auto, translation=auto +ata0-master: type=disk, path="_disk_image", mode=flat, cylinders=0, heads=0, spt=0, model="Generic 1234", biosdetect=auto, translation=auto ata0-slave: type=none ata1: enabled=true, ioaddr1=0x170, ioaddr2=0x370, irq=15 ata1-master: type=none @@ -34,8 +34,8 @@ cpuid: smap=false, mwait=true print_timestamps: enabled=0 port_e9_hack: enabled=1 private_colormap: enabled=0 -#clock: sync=realtime, time0=local, rtc_sync=1 -clock: sync=none, time0=local, rtc_sync=1 +clock: sync=realtime, time0=local, rtc_sync=1 +#clock: sync=none, time0=local, rtc_sync=1 # no cmosimage log: - logprefix: %t%e%d