Commit 2152e740 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 419af24e 81864c2e

qemu-doc.texi

+0 −4
Original line number Diff line number Diff line
@@ -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:

tests/migration/stress.c

+1 −1
Original line number Diff line number Diff line
@@ -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);