qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: jrossi@linux.ibm.com
To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, thuth@redhat.com
Cc: frankja@linux.ibm.com, jrossi@linux.ibm.com
Subject: [PATCH 06/18] docs/system/s390x/bootdevices: Update the documentation about network booting
Date: Thu, 26 Sep 2024 20:51:05 -0400	[thread overview]
Message-ID: <20240927005117.1679506-7-jrossi@linux.ibm.com> (raw)
In-Reply-To: <20240927005117.1679506-1-jrossi@linux.ibm.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>

---
 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.45.1



  parent reply	other threads:[~2024-09-27  0:54 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-27  0:50 [PATCH V2 0/18] s390x: Add Full Boot Order Support jrossi
2024-09-27  0:51 ` [PATCH 01/18] hw/s390x/ipl: Provide more memory to the s390-ccw.img firmware jrossi
2024-09-27  0:51 ` [PATCH 02/18] pc-bios/s390-ccw: Use the libc from SLOF and remove sclp prints jrossi
2024-09-27  0:51 ` [PATCH 03/18] pc-bios/s390-ccw: Link the netboot code into the main s390-ccw.img binary jrossi
2024-09-27  0:51 ` [PATCH 04/18] hw/s390x: Remove the possibility to load the s390-netboot.img binary jrossi
2024-09-27  0:51 ` [PATCH 05/18] pc-bios/s390-ccw: Merge netboot.mak into the main Makefile jrossi
2024-09-27  0:51 ` jrossi [this message]
2024-09-27  0:51 ` [PATCH 07/18] pc-bios/s390-ccw: Remove panics from ISO IPL path jrossi
2024-09-27 15:02   ` Thomas Huth
2024-09-27 17:15     ` Jared Rossi
2024-09-30  6:11       ` Thomas Huth
2024-09-30 13:10         ` Jared Rossi
2024-09-27  0:51 ` [PATCH 08/18] pc-bios/s390-ccw: Remove panics from ECKD " jrossi
2024-09-27 15:29   ` Thomas Huth
2024-09-27 17:25     ` Jared Rossi
2024-09-27  0:51 ` [PATCH 09/18] pc-bios/s390-ccw: Remove panics from SCSI " jrossi
2024-09-30  7:48   ` Thomas Huth
2024-09-30 10:13     ` Thomas Huth
2024-09-27  0:51 ` [PATCH 10/18] pc-bios/s390-ccw: Remove panics from DASD " jrossi
2024-09-30  8:14   ` Thomas Huth
2024-09-27  0:51 ` [PATCH 11/18] pc-bios/s390-ccw: Remove panics from Netboot " jrossi
2024-09-30  9:39   ` Thomas Huth
2024-09-30 13:15     ` Jared Rossi
2024-09-27  0:51 ` [PATCH 12/18] pc-bios/s390-ccw: Enable failed IPL to return after error jrossi
2024-09-30 10:11   ` Thomas Huth
2024-09-30 13:29     ` Jared Rossi
2024-09-27  0:51 ` [PATCH 13/18] include/hw/s390x: Add include files for common IPL structs jrossi
2024-09-30 10:42   ` Thomas Huth
2024-09-30 13:31     ` Jared Rossi
2024-09-27  0:51 ` [PATCH 14/18] s390x: Add individual loadparm assignment to CCW device jrossi
2024-09-30 11:25   ` Thomas Huth
2024-09-27  0:51 ` [PATCH 15/18] hw/s390x: Build an IPLB for each boot device jrossi
2024-09-30 11:59   ` Thomas Huth
2024-09-30 13:39     ` Jared Rossi
2024-09-27  0:51 ` [PATCH 16/18] s390x: Rebuild IPLB for SCSI device directly from DIAG308 jrossi
2024-09-30 12:15   ` Thomas Huth
2024-09-30 13:46     ` Jared Rossi
2024-09-27  0:51 ` [PATCH 17/18] pc-bios/s390x: Enable multi-device boot loop jrossi
2024-09-30 12:32   ` Thomas Huth
2024-09-30 13:48     ` Jared Rossi
2024-09-30 13:08   ` Thomas Huth
2024-09-30 13:52     ` Jared Rossi
2024-09-27  0:51 ` [PATCH 18/18] docs/system: Update documentation for s390x IPL jrossi
2024-09-30 12:34   ` Thomas Huth
2024-09-30 13:14 ` [PATCH V2 0/18] s390x: Add Full Boot Order Support Thomas Huth
2024-09-30 14:20   ` Jared Rossi

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=20240927005117.1679506-7-jrossi@linux.ibm.com \
    --to=jrossi@linux.ibm.com \
    --cc=frankja@linux.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=thuth@redhat.com \
    /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).