diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-11-29 14:17:27 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-11-29 14:17:27 +0000 |
| commit | e414f49fa31bba0272a0c40699abad86cd952977 (patch) | |
| tree | f5299b139bc6a6d9985a38517a5b9f4248246c8a /docs/misc/qemu-upstream_howto_use_it.markdown | |
| parent | bb477a1b869ee857c72291604cf9c27415e4be25 (diff) | |
| download | xen-e414f49fa31bba0272a0c40699abad86cd952977.tar.gz xen-e414f49fa31bba0272a0c40699abad86cd952977.tar.bz2 xen-e414f49fa31bba0272a0c40699abad86cd952977.zip | |
docs: tweak markup and wording of qemu upstream doc slightly
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
Acked-by: Ian Jackson <ian.jackson.citrix.com>
Diffstat (limited to 'docs/misc/qemu-upstream_howto_use_it.markdown')
| -rw-r--r-- | docs/misc/qemu-upstream_howto_use_it.markdown | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/docs/misc/qemu-upstream_howto_use_it.markdown b/docs/misc/qemu-upstream_howto_use_it.markdown index 14ff4a0e26..c7441c4226 100644 --- a/docs/misc/qemu-upstream_howto_use_it.markdown +++ b/docs/misc/qemu-upstream_howto_use_it.markdown @@ -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 use the new SEABIOS_DIR parameter. 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 such as `--disable-kvm`. 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 |