From b7a9e9647c2bf668d3014768f87ba57cb1b564ae Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Tue, 1 Oct 2019 13:01:11 +0200 Subject: [PATCH 1/2] qemu-doc: Remove paragraph about requiring a HD image with -kernel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The need for specifying "-hda" together with "-kernel" has been removed in commit 57a46d057995 ("Convert linux bootrom to external rom and fw_cfg"), almost 10 years ago, so let's remove this description from our documentation now, too. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrangé Reviewed-by: Stefano Garzarella Reviewed-by: Laszlo Ersek Message-Id: <20191001110111.4870-1-thuth@redhat.com> Signed-off-by: Laurent Vivier --- qemu-doc.texi | 4 ---- 1 file changed, 4 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: From 81864c2e6166c015d30b8d8ae998a5a1238a68e9 Mon Sep 17 00:00:00 2001 From: Mao Zhongyi Date: Sat, 5 Oct 2019 01:32:49 +0800 Subject: [PATCH 2/2] tests/migration: fix a typo in comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mao Zhongyi Reviewed-by: Alex Bennée Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Message-Id: <1d0aa8142a10edf735dac0a3330c46e98b06e8eb.1570208781.git.maozhongyi@cmss.chinamobile.com> Signed-off-by: Laurent Vivier --- tests/migration/stress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);