Skip to contentSkip to conversation

s390-ccw: only print boot menu error if -boot menu=on was specified

PATCH Superseded Collin L. Walling 2 participants 3 messages Feb 27, 2018

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390-ccw: only print boot menu error if -boot menu=on was specified

It is possible that certain QEMU configurations may not create an IPLB (such as when -kernel is provided). In this case, a misleading error message will be printed stating that the "boot menu is not supported for this device type".

To amend this, only print this message iff boot menu=on was provided on the commandline. Otherwise, return silently.

---
 hw/s390x/ipl.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
hw/s390x/ipl.c +3 -1
index 798e99a..c4addb5 100644
@@ -250,7 +250,9 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl)
     case S390_IPL_TYPE_QEMU_SCSI:
         break;
     default:
-        error_report("boot menu is not supported for this device type.");
+        if (boot_menu) {
+            error_report("boot menu is not supported for this device type.");
+        }
         return;
     }
 
Signature · 1 line
2.7.4
#1 lore raw

On Tue, 27 Feb 2018 10:19:20 -0500
"Collin L. Walling" <[email protected]> wrote:

Nit: make the prefix s390x/ipl:, as this is not directly in the bios.

Quoted 19 lines

It is possible that certain QEMU configurations may not create an IPLB (such as when -kernel is provided). In this case, a misleading error message will be printed stating that the "boot menu is not supported for this device type".

To amend this, only print this message iff boot menu=on was provided on the commandline. Otherwise, return silently.

---
 hw/s390x/ipl.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
hw/s390x/ipl.c +0 -0
index 798e99a..c4addb5 100644

hw/s390x/ipl.c static void s390_ipl_set_boot_menu(S390IPLState *ipl) · line 258

Quoted 10 lines
hw/s390x/ipl.c +3 -1
@@ -250,7 +250,9 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl)
     case S390_IPL_TYPE_QEMU_SCSI:
         break;
     default:
-        error_report("boot menu is not supported for this device type.");
+        if (boot_menu) {
+            error_report("boot menu is not supported for this device type.");
+        }
         return;
     }
 

This change makes sense and works as I'd expect (although the message is still slightly odd in the -kernel case, but I can't think of anything better.)

Will you also do a followup removing the trailing punctuation? :)

#2 lore raw
Quoted 38 lines · Cornelia Huck

On Tue, 27 Feb 2018 10:19:20 -0500
"Collin L. Walling" <[email protected]> wrote:

Nit: make the prefix s390x/ipl:, as this is not directly in the bios.

Quoted 19 lines

It is possible that certain QEMU configurations may not create an IPLB (such as when -kernel is provided). In this case, a misleading error message will be printed stating that the "boot menu is not supported for this device type".

To amend this, only print this message iff boot menu=on was provided on the commandline. Otherwise, return silently.

---
  hw/s390x/ipl.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
hw/s390x/ipl.c +0 -0
index 798e99a..c4addb5 100644

hw/s390x/ipl.c static void s390_ipl_set_boot_menu(S390IPLState *ipl) · line 258

Quoted 10 lines
hw/s390x/ipl.c +3 -1
@@ -250,7 +250,9 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl)
      case S390_IPL_TYPE_QEMU_SCSI:
          break;
      default:
-        error_report("boot menu is not supported for this device type.");
+        if (boot_menu) {
+            error_report("boot menu is not supported for this device type.");
+        }
          return;
      }
 

This change makes sense and works as I'd expect (although the message is still slightly odd in the -kernel case, but I can't think of anything better.)

Quoted 2 lines

Will you also do a followup removing the trailing punctuation? :)

You got it!

Signature · 1 line
- Collin L Walling