diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sphinx/qapidoc.py | 2 | ||||
| -rw-r--r-- | docs/user/main.rst | 61 |
2 files changed, 1 insertions, 62 deletions
diff --git a/docs/sphinx/qapidoc.py b/docs/sphinx/qapidoc.py index e03abcbb95..b7b86b5dff 100644 --- a/docs/sphinx/qapidoc.py +++ b/docs/sphinx/qapidoc.py @@ -464,7 +464,7 @@ class QAPISchemaGenDepVisitor(QAPISchemaVisitor): self._qapidir = qapidir def visit_module(self, name): - if name is not None: + if name != "./builtin": qapifile = self._qapidir + '/' + name self._env.note_dependency(os.path.abspath(qapifile)) super().visit_module(name) diff --git a/docs/user/main.rst b/docs/user/main.rst index 8dfe232a3a..e08d4be63b 100644 --- a/docs/user/main.rst +++ b/docs/user/main.rst @@ -45,67 +45,6 @@ emulator. Linux User space emulator ------------------------- -Quick Start -~~~~~~~~~~~ - -In order to launch a Linux process, QEMU needs the process executable -itself and all the target (x86) dynamic libraries used by it. - -- On x86, you can just try to launch any process by using the native - libraries:: - - qemu-i386 -L / /bin/ls - - ``-L /`` tells that the x86 dynamic linker must be searched with a - ``/`` prefix. - -- Since QEMU is also a linux process, you can launch QEMU with QEMU - (NOTE: you can only do that if you compiled QEMU from the sources):: - - qemu-i386 -L / qemu-i386 -L / /bin/ls - -- On non x86 CPUs, you need first to download at least an x86 glibc - (``qemu-runtime-i386-XXX-.tar.gz`` on the QEMU web page). Ensure that - ``LD_LIBRARY_PATH`` is not set:: - - unset LD_LIBRARY_PATH - - Then you can launch the precompiled ``ls`` x86 executable:: - - qemu-i386 tests/i386/ls - - You can look at ``scripts/qemu-binfmt-conf.sh`` so that QEMU is - automatically launched by the Linux kernel when you try to launch x86 - executables. It requires the ``binfmt_misc`` module in the Linux - kernel. - -- The x86 version of QEMU is also included. You can try weird things - such as:: - - qemu-i386 /usr/local/qemu-i386/bin/qemu-i386 \ - /usr/local/qemu-i386/bin/ls-i386 - -Wine launch -~~~~~~~~~~~ - -- Ensure that you have a working QEMU with the x86 glibc distribution - (see previous section). In order to verify it, you must be able to - do:: - - qemu-i386 /usr/local/qemu-i386/bin/ls-i386 - -- Download the binary x86 Wine install (``qemu-XXX-i386-wine.tar.gz`` - on the QEMU web page). - -- Configure Wine on your account. Look at the provided script - ``/usr/local/qemu-i386/bin/wine-conf.sh``. Your previous - ``${HOME}/.wine`` directory is saved to ``${HOME}/.wine.org``. - -- Then you can try the example ``putty.exe``:: - - qemu-i386 /usr/local/qemu-i386/wine/bin/wine \ - /usr/local/qemu-i386/wine/c/Program\ Files/putty.exe - Command line options ~~~~~~~~~~~~~~~~~~~~ |