OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Documentation update and a typo fix

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAl2uvP8SHGxhdXJlbnRA
 dml2aWVyLmV1AAoJEPMMOL0/L748dtoP/iv1SnIxnUV7gp+3nMDw6YK5Elts201H
 EfTEyZk44x9j5L/Y5Srftq5GRz8GoO9HDzYQ2Qvjn+Wo2LHFpMknf6T9Hx5CC8xC
 UlOhkoy+XjIprXIYYENmsSPvEyAdZzkhCjHNszPL1ambm1bk5ojjg4dNzdFCJBm6
 zHxUM82iz3AZyIO3i41QpQOHNwxbQywWnhrFHlDeQOuhvaQM5i3eVqKElpCli5bM
 C4FfnThyyGRgQjZzkOkhNWsfi0UiPRr2kTuLgPJtf8u4/A0oIHGyDXlQS1ANr1Um
 bRppmBPCEXp3EADabj0T9b8IoLpsN3mJBTB9k/cLr+SfAv1agE4aWX5XpECb8icv
 /8ix1EKscTpVu0Tti2G9EQ4/dC9CwxkjOiA7v3hROnHCa6cn0u6JQfMT+UhVBQ5o
 HmIaKYGDqtZkfF4STNw+Aca2H3DEEZLXyYxrFMkNnQjN/7eSLY9eJcg9oiBRN6OB
 7eMboIV7nPMgaRgN77Esq1rj0hqIsi8406ySkAp4CkPDLjAzZZVXoCo6aT+3rtUt
 jzsbhtp8mZOSBTphqZ++JVnKqUDUCifYJg+Mi+3+59AC83hteMSGSwI+wTOxajp+
 r+30lYlN3JUmtOBml9aT6MLkqfYpYXmA6l2EileYBOHWxiTKgsGC0Jzya9Y/YpbB
 02vqEgBzDZlu
 =upN+
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging

Documentation update and a typo fix

# gpg: Signature made Tue 22 Oct 2019 09:25:35 BST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-pull-request:
  tests/migration: fix a typo in comment
  qemu-doc: Remove paragraph about requiring a HD image with -kernel

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2019-10-22 12:03:02 +01:00
commit 2152e740a8
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qemu-doc.texi
View File

@ -906,10 +906,6 @@ Use @option{-kernel} to provide the Linux kernel image and
@option{-append} to give the kernel command line arguments. The
@option{-initrd} option can be used to provide an INITRD image.
When using the direct Linux boot, a disk image for the first hard disk
@file{hda} is required because its boot sector is used to launch the
Linux kernel.
If you do not need graphical output, you can disable it and redirect
the virtual serial port and the QEMU monitor to the console with the
@option{-nographic} option. The typical command line is:

2
tests/migration/stress.c
View File

@ -192,7 +192,7 @@ static int stressone(unsigned long long ramsizeMB)
/* We don't care about initial state, but we do want
* to fault it all into RAM, otherwise the first iter
* of the loop below will be quite slow. We cna't use
* of the loop below will be quite slow. We can't use
* 0x0 as the byte as gcc optimizes that away into a
* calloc instead :-) */
memset(ram, 0xfe, ramsizeMB * 1024 * 1024);