From edf05462265c967522aa7b3c2d43e5e97b12fc47 Mon Sep 17 00:00:00 2001
From: Gabriele Giacone <1o5g4r8o@gmail.com>
Date: Fri, 28 Feb 2014 16:26:40 +0100
Subject: Uncommitted changes.

... in darnassus:~hurd-web/public_html.workspace/.
---
 hurd/running/qemu.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'hurd/running/qemu.mdwn')

diff --git a/hurd/running/qemu.mdwn b/hurd/running/qemu.mdwn
index df65eb7b..83ad94b4 100644
--- a/hurd/running/qemu.mdwn
+++ b/hurd/running/qemu.mdwn
@@ -366,6 +366,23 @@ Once you have logged in as `root` run the `pfinet` translator with values that a
 
 That should do it! Do not forget to edit/update `/etc/resolv.conf` to get DNS working.
 
+# QEMU Multiboot
+
+See [[open_issues/debugging_gnumach_startup_qemu_gdb/#index2h1]].
+See "Linux/Multiboot boot specific" section on QEMU manpage.
+
+    # take for instance cdimage boot components
+    $ wget http://people.debian.org/~sthibault/hurd-i386/installer/cdimage/current/{gnumach.gz,initrd.gz,ext2fs.static,ld.so.1}
+
+gnumach needs to be uncompressed
+
+    $ gunzip gnumach.gz
+    $ sudo qemu-kvm \
+    --kernel gnumach \
+    --initrd " \
+    initrd.gz \$(ramdisk-create), \
+    ext2fs.static --multiboot-command-line=\${kernel-command-line} --host-priv-port=\${host-port} --device-master-port=\${device-port} --exec-server-task=\${exec-task} -T typed gunzip:device:rd0 \$(task-create) \$(task-resume), \
+    ld.so.1 /hurd/exec \$(exec-task=task-create)"
 
 # Related Links
 
-- 
cgit v1.2.3


From 6e2fa7360e54b1b36ab2e343c5143797af82fd87 Mon Sep 17 00:00:00 2001
From: gg0 <gg0@web>
Date: Fri, 28 Feb 2014 22:43:15 +0100
Subject:

---
 hurd/running/qemu.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'hurd/running/qemu.mdwn')

diff --git a/hurd/running/qemu.mdwn b/hurd/running/qemu.mdwn
index 83ad94b4..02ad17fb 100644
--- a/hurd/running/qemu.mdwn
+++ b/hurd/running/qemu.mdwn
@@ -371,7 +371,8 @@ That should do it! Do not forget to edit/update `/etc/resolv.conf` to get DNS wo
 See [[open_issues/debugging_gnumach_startup_qemu_gdb/#index2h1]].
 See "Linux/Multiboot boot specific" section on QEMU manpage.
 
-    # take for instance cdimage boot components
+Get for instance cdimage boot components
+
     $ wget http://people.debian.org/~sthibault/hurd-i386/installer/cdimage/current/{gnumach.gz,initrd.gz,ext2fs.static,ld.so.1}
 
 gnumach needs to be uncompressed
-- 
cgit v1.2.3


From 38f25fe773ec0163e04ba9aa6849024701809b07 Mon Sep 17 00:00:00 2001
From: gg0 <gg0@web>
Date: Sun, 2 Mar 2014 17:00:23 +0100
Subject: Add TOC to qemu page

---
 hurd/running/qemu.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'hurd/running/qemu.mdwn')

diff --git a/hurd/running/qemu.mdwn b/hurd/running/qemu.mdwn
index 02ad17fb..2fe43e05 100644
--- a/hurd/running/qemu.mdwn
+++ b/hurd/running/qemu.mdwn
@@ -14,6 +14,8 @@ This page discusses things for [[Unix]] systems, there is a separate page for
 
 See the discussion about [[hurd/running/qemu/writeback_caching]].
 
+[[!toc]]
+
 # Readily Available Images
 
 You can use the following images to give the GNU/Hurd a try.
-- 
cgit v1.2.3


From 57f12fa63869ba72cb719d611baf83f654eec648 Mon Sep 17 00:00:00 2001
From: gg0 <gg0@web>
Date: Thu, 6 Mar 2014 00:19:16 +0100
Subject: Remove spaces

---
 hurd/running/qemu.mdwn | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'hurd/running/qemu.mdwn')

diff --git a/hurd/running/qemu.mdwn b/hurd/running/qemu.mdwn
index 2fe43e05..25828d0e 100644
--- a/hurd/running/qemu.mdwn
+++ b/hurd/running/qemu.mdwn
@@ -382,10 +382,11 @@ gnumach needs to be uncompressed
     $ gunzip gnumach.gz
     $ sudo qemu-kvm \
     --kernel gnumach \
-    --initrd " \
-    initrd.gz \$(ramdisk-create), \
-    ext2fs.static --multiboot-command-line=\${kernel-command-line} --host-priv-port=\${host-port} --device-master-port=\${device-port} --exec-server-task=\${exec-task} -T typed gunzip:device:rd0 \$(task-create) \$(task-resume), \
-    ld.so.1 /hurd/exec \$(exec-task=task-create)"
+    --initrd "\
+    initrd.gz \$(ramdisk-create),\
+    ext2fs.static --multiboot-command-line=\${kernel-command-line} --host-priv-port=\${host-port} --device-master-port=\${device-port} --exec-server-task=\${exec-task} -T typed gunzip:device:rd0 \$(task-create) \$(task-resume),\
+    ld.so.1 /hurd/exec \$(exec-task=task-create)" \
+    <other_qemu_options>
 
 # Related Links
 
-- 
cgit v1.2.3


From abde2322bd4c6c7aa7d3c2876cb88ace62f617b7 Mon Sep 17 00:00:00 2001
From: gg0 <gg0@web>
Date: Thu, 6 Mar 2014 00:45:21 +0100
Subject: Fix qemu binary name and options

---
 hurd/running/qemu.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'hurd/running/qemu.mdwn')

diff --git a/hurd/running/qemu.mdwn b/hurd/running/qemu.mdwn
index 25828d0e..d389397b 100644
--- a/hurd/running/qemu.mdwn
+++ b/hurd/running/qemu.mdwn
@@ -380,7 +380,7 @@ Get for instance cdimage boot components
 gnumach needs to be uncompressed
 
     $ gunzip gnumach.gz
-    $ sudo qemu-kvm \
+    $ sudo qemu-system-i386 --enable-kvm -m 512 \
     --kernel gnumach \
     --initrd "\
     initrd.gz \$(ramdisk-create),\
-- 
cgit v1.2.3


From 9ff68a05907b827a001b8bace54df141868c9b7b Mon Sep 17 00:00:00 2001
From: gg0 <gg0@web>
Date: Thu, 6 Mar 2014 00:50:04 +0100
Subject: Remove --enable-kvm

---
 hurd/running/qemu.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'hurd/running/qemu.mdwn')

diff --git a/hurd/running/qemu.mdwn b/hurd/running/qemu.mdwn
index d389397b..ec3fe153 100644
--- a/hurd/running/qemu.mdwn
+++ b/hurd/running/qemu.mdwn
@@ -380,7 +380,7 @@ Get for instance cdimage boot components
 gnumach needs to be uncompressed
 
     $ gunzip gnumach.gz
-    $ sudo qemu-system-i386 --enable-kvm -m 512 \
+    $ sudo qemu-system-i386 -m 512 \
     --kernel gnumach \
     --initrd "\
     initrd.gz \$(ramdisk-create),\
-- 
cgit v1.2.3