diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-10-22 12:03:02 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-10-22 12:03:03 +0100 |
| commit | 2152e740a8938b3bad73bfe1a01f8b94dab02d41 (patch) | |
| tree | 409777e5a15a879f12442d6f6a1c6defaec8bd83 | |
| parent | 419af24e7e492dd94a16a1691736ab48d0029a30 (diff) | |
| parent | 81864c2e6166c015d30b8d8ae998a5a1238a68e9 (diff) | |
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>
| -rw-r--r-- | qemu-doc.texi | 4 | ||||
| -rw-r--r-- | tests/migration/stress.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/qemu-doc.texi b/qemu-doc.texi index 2ba6c90c08..3c5022050f 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -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: diff --git a/tests/migration/stress.c b/tests/migration/stress.c index d9aa4afe92..0c23964693 100644 --- a/tests/migration/stress.c +++ b/tests/migration/stress.c @@ -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); |