[PULL 0/1] Docs update for 2026-06-16

[PULL 0/1] Docs update for 2026-06-16

[Pierrick Bouvier]

The following changes since commit b0df6e2f2c6c45df8d4d286933799c623e124d98:

  Merge tag 'pull-riscv-to-apply-20260616' of https://github.com/alistair23/qemu into staging (2026-06-16 10:41:47 -0400)

are available in the Git repository at:

  https://gitlab.com/p-b-o/qemu tags/pbouvier/pr/docs-20260616

for you to fetch changes up to 717cd7bc7602323ef03ddd63046e66e20f17dcb6:

  add a note on -shim to direct kernel boot docs (2026-06-16 10:54:58 -0700)

----------------------------------------------------------------
Changes:
- [PATCH v2] add a note on -shim to direct kernel boot docs (Gerd Hoffmann <kraxel@redhat.com>)
  Link: https://lore.kernel.org/qemu-devel/20260612161707.158029-1-kraxel@redhat.com

----------------------------------------------------------------
Gerd Hoffmann (1):
      add a note on -shim to direct kernel boot docs

 docs/system/linuxboot.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

[PULL 1/1] add a note on -shim to direct kernel boot docs

[Pierrick Bouvier]

From: Gerd Hoffmann <kraxel@redhat.com>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Link: https://lore.kernel.org/qemu-devel/20260612161707.158029-1-kraxel@redhat.com
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
---
 docs/system/linuxboot.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/system/linuxboot.rst b/docs/system/linuxboot.rst
index f7573ab80aa..c9db5db19b5 100644
--- a/docs/system/linuxboot.rst
+++ b/docs/system/linuxboot.rst
@@ -17,6 +17,23 @@ Use ``-kernel`` to provide the Linux kernel image and ``-append`` to
 give the kernel command line arguments. The ``-initrd`` option can be
 used to provide an INITRD image.
 
+The ``-shim`` option specifies the ``shim.efi`` binary.  This is needed
+when you are booting UEFI firmware and using the ``-kernel`` option to
+tell UEFI to boot a specific kernel image, and the UEFI firmware you
+are booting has UEFI secure boot enabled.
+
+When this option is specified, the guest UEFI firmware will first
+load, verify and run the shim binary, which is typically signed by
+Microsoft so the firmware accepts it.  The shim binary in turn will
+load and verify the Linux kernel.  The kernel is typically signed by
+the distro and the certificates needed to verify them are compiled
+into the shim binary, so shim and kernel must come from the same Linux
+distribution.
+
+Usually you can find shim.efi as ``EFI/BOOT/BOOT{X64,AA64}.EFI`` on
+distro install media.  You might find a second shim copy in the
+``EFI/$distro/`` directory.
+
 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
 ``-nographic`` option. The typical command line is:
-- 
2.47.3

Re: [PULL 0/1] Docs update for 2026-06-16

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 116 bytes --]

Applied, thanks.

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[PULL 0/1] Docs update for 2026-06-16

[Pierrick Bouvier]

The following changes since commit b0df6e2f2c6c45df8d4d286933799c623e124d98:

  Merge tag 'pull-riscv-to-apply-20260616' of https://github.com/alistair23/qemu into staging (2026-06-16 10:41:47 -0400)

are available in the Git repository at:

  https://gitlab.com/p-b-o/qemu tags/pbouvier/pr/docs-20260616

for you to fetch changes up to f00622a929b296902f9b23a5fd5dc1b5988e669a:

  add a note on -shim to direct kernel boot docs (2026-06-16 10:48:14 -0700)

----------------------------------------------------------------
Changes:
- [PATCH v2] add a note on -shim to direct kernel boot docs (Gerd Hoffmann <kraxel@redhat.com>)
  Link: https://lore.kernel.org/qemu-devel/20260612161707.158029-1-kraxel@redhat.com

----------------------------------------------------------------
Gerd Hoffmann (1):
      add a note on -shim to direct kernel boot docs

 docs/system/linuxboot.rst | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

Re: [PULL 0/1] Docs update for 2026-06-16

[Pierrick Bouvier]

On 6/16/2026 10:53 AM, Pierrick Bouvier wrote:
> The following changes since commit b0df6e2f2c6c45df8d4d286933799c623e124d98:
> 
>   Merge tag 'pull-riscv-to-apply-20260616' of https://github.com/alistair23/qemu into staging (2026-06-16 10:41:47 -0400)
> 
> are available in the Git repository at:
> 
>   https://gitlab.com/p-b-o/qemu tags/pbouvier/pr/docs-20260616
> 
> for you to fetch changes up to f00622a929b296902f9b23a5fd5dc1b5988e669a:
> 
>   add a note on -shim to direct kernel boot docs (2026-06-16 10:48:14 -0700)
> 
> ----------------------------------------------------------------
> Changes:
> - [PATCH v2] add a note on -shim to direct kernel boot docs (Gerd Hoffmann <kraxel@redhat.com>)
>   Link: https://lore.kernel.org/qemu-devel/20260612161707.158029-1-kraxel@redhat.com
> 
> ----------------------------------------------------------------
> Gerd Hoffmann (1):
>       add a note on -shim to direct kernel boot docs
> 
>  docs/system/linuxboot.rst | 19 ++++++++++++++++++-
>  1 file changed, 18 insertions(+), 1 deletion(-)

Please ignore this PR, as the patch has incorrect content that was added
when amending it.

The correct PR is:
https://lore.kernel.org/qemu-devel/20260616175535.268519-1-pierrick.bouvier@oss.qualcomm.com/T/#t

Sorry for the noise,
Pierrick