# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1321541678 0
# Node ID c1f8406da50743cd0597b93c4b5b8b6ff03ede42
# Parent 55ce23cb7b2af3c497b3a10658e09d5fc11eb45f
docs: tweak markup and wording of qemu upstream doc slightly
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
diff -r 55ce23cb7b2a -r c1f8406da507
docs/misc/qemu-upstream_howto_use_it.markdown
--- a/docs/misc/qemu-upstream_howto_use_it.markdown Thu Nov 17 14:54:38
2011 +0000
+++ b/docs/misc/qemu-upstream_howto_use_it.markdown Thu Nov 17 14:54:38
2011 +0000
@@ -1,11 +1,11 @@
-Help to use QEMU (upstream version) with Xen
-============================================
+Using Upstream QEMU with Xen
+============================
Note
----
All these steps will become unnecessary after the patches to integrate
-SeaBIOS/QEMU build will be applied.
+SeaBIOS/QEMU into the Xen build system have been applied.
How to build it
@@ -15,14 +15,15 @@ How to build it
The new device-model needs a different BIOS, SeaBIOS. Clone the repository
from:
- - git://git.qemu.org/seabios.git
- - http://git.qemu.org/git/seabios.git
+ - [git://git.qemu.org/seabios.git]()
+ - [http://git.qemu.org/git/seabios.git]()
-Put the `.config` file in the appendix at the root of seabios.git and build
SeaBIOS.
+Put the `.config` file in the appendix at the root of `seabios.git`
+and build SeaBIOS by typing `make`.
-In xen-unstable source tree, add the file `.config` with
+In the xen-unstable source tree, add the file `.config` with
`SEABIOS_DIR = /path/to/seabios.git`.
-To build hvmloader with SeaBIOS, you propably need to `make -C tools/firmware
+To build hvmloader with SeaBIOS, you probably need to `make -C tools/firmware
clean` first and then `make tools`, to use the new SEABIOS_DIR parameter.
@@ -30,10 +31,10 @@ clean` first and then `make tools`, to u
Get QEMU upstream source from:
- - git://xenbits.xensource.com/qemu-upstream-unstable.git
- - http://xenbits.xensource.com/git-http/qemu-upstream-unstable.git
+ - [git://xenbits.xensource.com/qemu-upstream-unstable.git]()
+ - [http://xenbits.xensource.com/git-http/qemu-upstream-unstable.git]()
-To configure build QEMU upstream with Xen
+To configure QEMU upstream with support for Xen:
./configure --enable-xen --target-list=i386-softmmu
--extra-cflags="-I$path_to_xen_source/tools/include
-I$path_to_xen_source/tools/libxc -I$path_to_xen_source/tools/xenstore"
--extra-ldflags="-L$path_to_xen_source/tools/libxc
-L$path_to_xen_source/tools/xenstore"
@@ -43,15 +44,15 @@ You can also use other several options s
How to use QEMU upstream
------------------------
-Only xl support QEMU upstream.
+Only `xl` supports QEMU upstream.
To actually use it, add or change this in your VM configuration file:
device_model_version = 'qemu-xen'
device_model_override = '/path/to/qemu/i386-softmmu/qemu'
-NB: On qemu-upstream repository, the default binary name has been renamed to
-`qemu-system-i386`.
+NB: In the `qemu-upstream` repository, the default binary name has been
+renamed to `qemu-system-i386`.
Appendix
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|