Skip to contentSkip to conversation

fix strict boot regression

PATCH Superseded Amos Kong 2 participants 4 messages Dec 9, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Amos Kong

author
#0 lore raw

cover fix strict boot regression

parsing of "strict" is wrongly removed, we need it. The first patch fixes a typo.

Amos Kong (2):
fix a typo of strict option
add parsing of "strict" boot parameter

 pc-bios/bios.bin |  Bin 131072 -> 131072 bytes
 vl.c             |    3 ++-
 2 files changed, 2 insertions(+), 1 deletions(-)
author
#1 lore raw

PATCH 1/2 fix a typo of strict option

The type of "strict" should be bool.

---
 vl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
vl.c +1 -1
index b0399de..12fe1f7 100644
@@ -461,7 +461,7 @@ static QemuOptsList qemu_boot_opts = {
             .type = QEMU_OPT_STRING,
         }, {
             .name = "strict",
-            .type = QEMU_OPT_STRING,
+            .type = QEMU_OPT_BOOL,
         },
         { /*End of list */ }
     },
Signature · 1 line
1.7.1
author
#2 lore raw

PATCH 2/2 add parsing of "strict" boot parameter

In reply to Amos Kong

Commit 6ef4716cecdfa1b3794c1a33edba9840e1aa6b5f cleaned up the parse code of boot parameter, parse code of "strict" wasn't re-implemented, it caused that strict boot feature is always disabled.

---
 pc-bios/bios.bin |  Bin 131072 -> 131072 bytes
 vl.c             |    1 +
 2 files changed, 1 insertions(+), 0 deletions(-)
pc-bios/bios.bin binary +0 -0
index 4f4383b06a95cd0f479c9d9e8e07234748a7279b..f88412c89a73f19d2d5876a6d8db3c7d966e2231 100644
GIT binary patch
vl.c +1 -0
index 12fe1f7..ae6d0c6 100644
@@ -4074,6 +4074,7 @@ int main(int argc, char **argv, char **envp)
         }
 
         boot_menu = qemu_opt_get_bool(opts, "menu", boot_menu);
+        boot_strict = qemu_opt_get_bool(opts, "strict", false);
     }
 
     if (!kernel_cmdline) {
Signature · 1 line
1.7.1
#3 lore raw

Re: [Qemu-devel] [PATCH 2/2] add parsing of "strict" boot parameter

09.12.2013 11:51, Amos Kong пишет:

Quoted 9 lines

Commit 6ef4716cecdfa1b3794c1a33edba9840e1aa6b5f cleaned up the parse code of boot parameter, parse code of "strict" wasn't re-implemented, it caused that strict boot feature is always disabled.

---
 pc-bios/bios.bin |  Bin 131072 -> 131072 bytes
 vl.c             |    1 +

Did you really mean to patch bios.bin too, not only vl.c?

Note that kraxel requested a "bios split" patch to be pulled too, so now we should have bios-128k.bin and bios-256k.bin, but no bios.bin.

Thanks,

/mjt