qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Jared Rossi <jrossi@linux.ibm.com>
Subject: [PULL 06/23] docs/system/s390x/bootdevices: Update the documentation about network booting
Date: Wed, 23 Oct 2024 15:16:53 +0200	[thread overview]
Message-ID: <20241023131710.906748-7-thuth@redhat.com> (raw)
In-Reply-To: <20241023131710.906748-1-thuth@redhat.com>

From: Jared Rossi <jrossi@linux.ibm.com>

Remove the information about the separate s390-netboot.img from
the documentation.

Co-authored by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
Message-ID: <20241020012953.1380075-7-jrossi@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 docs/system/s390x/bootdevices.rst | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/docs/system/s390x/bootdevices.rst b/docs/system/s390x/bootdevices.rst
index 1a7a18b43b..c97efb8fc0 100644
--- a/docs/system/s390x/bootdevices.rst
+++ b/docs/system/s390x/bootdevices.rst
@@ -82,23 +82,17 @@ Note that ``0`` can be used to boot the default entry.
 Booting from a network device
 -----------------------------
 
-Beside the normal guest firmware (which is loaded from the file ``s390-ccw.img``
-in the data directory of QEMU, or via the ``-bios`` option), QEMU ships with
-a small TFTP network bootloader firmware for virtio-net-ccw devices, too. This
-firmware is loaded from a file called ``s390-netboot.img`` in the QEMU data
-directory. In case you want to load it from a different filename instead,
-you can specify it via the ``-global s390-ipl.netboot_fw=filename``
-command line option.
-
-The ``bootindex`` property is especially important for booting via the network.
-If you don't specify the ``bootindex`` property here, the network bootloader
-firmware code won't get loaded into the guest memory so that the network boot
-will fail. For a successful network boot, try something like this::
+The firmware that ships with QEMU includes a small TFTP network bootloader
+for virtio-net-ccw devices.  The ``bootindex`` property is especially
+important for booting via the network. If you don't specify the ``bootindex``
+property here, the network bootloader won't be taken into consideration and
+the network boot will fail. For a successful network boot, try something
+like this::
 
  qemu-system-s390x -netdev user,id=n1,tftp=...,bootfile=... \
                    -device virtio-net-ccw,netdev=n1,bootindex=1
 
-The network bootloader firmware also has basic support for pxelinux.cfg-style
+The network bootloader also has basic support for pxelinux.cfg-style
 configuration files. See the `PXELINUX Configuration page
 <https://wiki.syslinux.org/wiki/index.php?title=PXELINUX#Configuration>`__
 for details how to set up the configuration file on your TFTP server.
-- 
2.47.0



  parent reply	other threads:[~2024-10-23 13:19 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-23 13:16 [PULL 00/23] s390-ccw bios update Thomas Huth
2024-10-23 13:16 ` [PULL 01/23] hw/s390x/ipl: Provide more memory to the s390-ccw.img firmware Thomas Huth
2024-10-23 13:16 ` [PULL 02/23] pc-bios/s390-ccw: Use the libc from SLOF and remove sclp prints Thomas Huth
2024-10-23 13:16 ` [PULL 03/23] pc-bios/s390-ccw: Link the netboot code into the main s390-ccw.img binary Thomas Huth
2024-10-23 13:16 ` [PULL 04/23] hw/s390x: Remove the possibility to load the s390-netboot.img binary Thomas Huth
2024-10-23 13:16 ` [PULL 05/23] pc-bios/s390-ccw: Merge netboot.mak into the main Makefile Thomas Huth
2024-10-23 13:16 ` Thomas Huth [this message]
2024-10-23 13:16 ` [PULL 07/23] pc-bios/s390-ccw: Remove panics from ISO IPL path Thomas Huth
2024-10-23 13:16 ` [PULL 08/23] pc-bios/s390-ccw: Remove panics from ECKD " Thomas Huth
2024-10-23 13:16 ` [PULL 09/23] pc-bios/s390-ccw: Remove panics from SCSI " Thomas Huth
2024-10-23 13:16 ` [PULL 10/23] pc-bios/s390-ccw: Remove panics from DASD " Thomas Huth
2024-10-23 13:16 ` [PULL 11/23] pc-bios/s390-ccw: Remove panics from Netboot " Thomas Huth
2024-10-23 13:16 ` [PULL 12/23] pc-bios/s390-ccw: Enable failed IPL to return after error Thomas Huth
2024-10-23 13:17 ` [PULL 13/23] include/hw/s390x: Add include files for common IPL structs Thomas Huth
2024-10-23 13:17 ` [PULL 14/23] s390x: Add individual loadparm assignment to CCW device Thomas Huth
2024-10-23 13:17 ` [PULL 15/23] hw/s390x: Build an IPLB for each boot device Thomas Huth
2025-06-16 10:04   ` Philippe Mathieu-Daudé
2025-06-16 15:04     ` Jared Rossi
2024-10-23 13:17 ` [PULL 16/23] s390x: Rebuild IPLB for SCSI device directly from DIAG308 Thomas Huth
2024-10-23 13:17 ` [PULL 17/23] pc-bios/s390x: Enable multi-device boot loop Thomas Huth
2024-10-23 13:17 ` [PULL 18/23] docs/system: Update documentation for s390x IPL Thomas Huth
2024-10-23 13:17 ` [PULL 19/23] tests/qtest: Add s390x boot order tests to cdrom-test.c Thomas Huth
2024-10-23 13:17 ` [PULL 20/23] pc-bios/s390-ccw: Clarify alignment is in bytes Thomas Huth
2024-10-23 13:17 ` [PULL 21/23] pc-bios/s390-ccw: Don't generate TEXTRELs Thomas Huth
2024-10-23 13:17 ` [PULL 22/23] pc-bios/s390-ccw: Introduce `EXTRA_LDFLAGS` Thomas Huth
2024-10-23 13:17 ` [PULL 23/23] pc-bios/s390-ccw: Update s390-ccw.img with the full boot order support feature Thomas Huth
2024-10-25 12:34 ` [PULL 00/23] s390-ccw bios update Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241023131710.906748-7-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=jrossi@linux.ibm.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).