[PULL 0/2] Trivial branch patches

[PULL 0/2] Trivial branch patches

[Laurent Vivier]

The following changes since commit e9d42461920f6f40f4d847a5ba18e90d095ed0b9:

  Merge remote-tracking branch 'remotes/kraxel/tags/audio-20191018-pull-request' into staging (2019-10-18 14:13:11 +0100)

are available in the Git repository at:

  git://github.com/vivier/qemu.git tags/trivial-branch-pull-request

for you to fetch changes up to 81864c2e6166c015d30b8d8ae998a5a1238a68e9:

  tests/migration: fix a typo in comment (2019-10-21 18:14:43 +0200)

----------------------------------------------------------------
Documentation update and a typo fix

----------------------------------------------------------------

Mao Zhongyi (1):
  tests/migration: fix a typo in comment

Thomas Huth (1):
  qemu-doc: Remove paragraph about requiring a HD image with -kernel

 qemu-doc.texi            | 4 ----
 tests/migration/stress.c | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

-- 
2.21.0

[PULL 1/2] qemu-doc: Remove paragraph about requiring a HD image with -kernel

[Laurent Vivier]

From: Thomas Huth <thuth@redhat.com>

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 <thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20191001110111.4870-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 qemu-doc.texi | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/qemu-doc.texi b/qemu-doc.texi
index 2ba6c90c083b..3c5022050f0f 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:
-- 
2.21.0

[PULL 2/2] tests/migration: fix a typo in comment

[Laurent Vivier]

From: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>

Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <1d0aa8142a10edf735dac0a3330c46e98b06e8eb.1570208781.git.maozhongyi@cmss.chinamobile.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 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 d9aa4afe928b..0c2396469344 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);
-- 
2.21.0

Re: [PULL 0/2] Trivial branch patches

[Peter Maydell]

On Tue, 22 Oct 2019 at 09:27, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit e9d42461920f6f40f4d847a5ba18e90d095ed0b9:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/audio-20191018-pull-request' into staging (2019-10-18 14:13:11 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu.git tags/trivial-branch-pull-request
>
> for you to fetch changes up to 81864c2e6166c015d30b8d8ae998a5a1238a68e9:
>
>   tests/migration: fix a typo in comment (2019-10-21 18:14:43 +0200)
>
> ----------------------------------------------------------------
> Documentation update and a typo fix
>
> ----------------------------------------------------------------
>
> Mao Zhongyi (1):
>   tests/migration: fix a typo in comment
>
> Thomas Huth (1):
>   qemu-doc: Remove paragraph about requiring a HD image with -kernel
>
>  qemu-doc.texi            | 4 ----
>  tests/migration/stress.c | 2 +-
>  2 files changed, 1 insertion(+), 5 deletions(-)
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.2
for any user-visible changes.

-- PMM