From 8f936e07ecb5af4053ad7d457a32e69695cb357e Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex.auvolat@ens.fr>
Date: Mon, 1 Dec 2014 17:27:57 +0100
Subject: Change qemu/bochs launch scripts.

---
 bochs.cfg          | 12 ------------
 bochs_debug.cfg    | 12 ++++++++++++
 run_bochs.sh       |  7 -------
 run_bochs_debug.sh |  7 +++++++
 run_qemu.sh        |  3 +--
 run_qemu_debug.sh  |  7 +++++++
 6 files changed, 27 insertions(+), 21 deletions(-)
 delete mode 100644 bochs.cfg
 create mode 100644 bochs_debug.cfg
 delete mode 100755 run_bochs.sh
 create mode 100755 run_bochs_debug.sh
 create mode 100755 run_qemu_debug.sh

diff --git a/bochs.cfg b/bochs.cfg
deleted file mode 100644
index 977a459..0000000
--- a/bochs.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-display_library: x, options="gui_debug"
-magic_break: enabled=1
-
-megs: 32
-romimage: file="/usr/share/bochs/BIOS-bochs-latest"
-vgaromimage: file="/usr/share/bochs/VGABIOS-lgpl-latest"
-mouse: enabled=0
-clock: sync=realtime
-cpu: ips=10000000
-ata0: enabled=1, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14
-ata0-master: type=cdrom, path="cdrom.iso", status=inserted, biosdetect=auto, model="Generic 1234"
-boot: cdrom
diff --git a/bochs_debug.cfg b/bochs_debug.cfg
new file mode 100644
index 0000000..977a459
--- /dev/null
+++ b/bochs_debug.cfg
@@ -0,0 +1,12 @@
+display_library: x, options="gui_debug"
+magic_break: enabled=1
+
+megs: 32
+romimage: file="/usr/share/bochs/BIOS-bochs-latest"
+vgaromimage: file="/usr/share/bochs/VGABIOS-lgpl-latest"
+mouse: enabled=0
+clock: sync=realtime
+cpu: ips=10000000
+ata0: enabled=1, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14
+ata0-master: type=cdrom, path="cdrom.iso", status=inserted, biosdetect=auto, model="Generic 1234"
+boot: cdrom
diff --git a/run_bochs.sh b/run_bochs.sh
deleted file mode 100755
index f692947..0000000
--- a/run_bochs.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-cd `dirname $0`
-
-make -C kernel
-./make_cdrom.sh
-bochs -f bochs.cfg -q
diff --git a/run_bochs_debug.sh b/run_bochs_debug.sh
new file mode 100755
index 0000000..848feb5
--- /dev/null
+++ b/run_bochs_debug.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+cd `dirname $0`
+
+make -C kernel
+./make_cdrom.sh
+bochs -f bochs_debug.cfg -q
diff --git a/run_qemu.sh b/run_qemu.sh
index b429471..c0b6906 100755
--- a/run_qemu.sh
+++ b/run_qemu.sh
@@ -3,5 +3,4 @@
 cd `dirname $0`
 
 make -C kernel
-qemu-system-i386 -kernel kernel/kernel.bin -serial stdio -s -S &
-(sleep 0.1; gdb kernel.bin -x gdb_cmd)
+qemu-system-i386 -kernel kernel/kernel.bin -serial stdio
diff --git a/run_qemu_debug.sh b/run_qemu_debug.sh
new file mode 100755
index 0000000..b429471
--- /dev/null
+++ b/run_qemu_debug.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+cd `dirname $0`
+
+make -C kernel
+qemu-system-i386 -kernel kernel/kernel.bin -serial stdio -s -S &
+(sleep 0.1; gdb kernel.bin -x gdb_cmd)
-- 
cgit v1.2.3