Blame SOURCES/kvm-fix-boot-strict-regressed-in-commit-6ef4716.patch

0a122b
From 98fa25db65984e59d72eebcc42265bdf5e02fd95 Mon Sep 17 00:00:00 2001
0a122b
From: Amos Kong <akong@redhat.com>
0a122b
Date: Tue, 14 Jan 2014 09:56:39 +0100
0a122b
Subject: [PATCH 15/16] fix -boot strict regressed in commit 6ef4716
0a122b
0a122b
RH-Author: Amos Kong <akong@redhat.com>
0a122b
Message-id: <1389693400-21546-2-git-send-email-akong@redhat.com>
0a122b
Patchwork-id: 56652
0a122b
O-Subject: [RHEL-7.0 qemu-kvm PATCH 1/2] fix -boot strict regressed in commit 6ef4716
0a122b
Bugzilla: 997817
0a122b
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
0a122b
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
0a122b
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
0a122b
0a122b
Commit 6ef4716 cleaned up parsing of -boot option argument, but
0a122b
accidentally dropped parameter strict.  It should have been updated
0a122b
exactly like parameter menu. Do that.
0a122b
0a122b
Signed-off-by: Amos Kong <akong@redhat.com>
0a122b
Reviewed-by: Markus Armbruster <armbru@redhat.com>
0a122b
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
0a122b
(cherry picked from commit e5187b561ff7b241d609a2848131879072169565)
0a122b
---
0a122b
 vl.c |    3 ++-
0a122b
 1 files changed, 2 insertions(+), 1 deletions(-)
0a122b
0a122b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
0a122b
---
0a122b
 vl.c |    3 ++-
0a122b
 1 files changed, 2 insertions(+), 1 deletions(-)
0a122b
0a122b
diff --git a/vl.c b/vl.c
0a122b
index 781c352..11899dc 100644
0a122b
--- a/vl.c
0a122b
+++ b/vl.c
0a122b
@@ -459,7 +459,7 @@ static QemuOptsList qemu_boot_opts = {
0a122b
             .type = QEMU_OPT_STRING,
0a122b
         }, {
0a122b
             .name = "strict",
0a122b
-            .type = QEMU_OPT_STRING,
0a122b
+            .type = QEMU_OPT_BOOL,
0a122b
         },
0a122b
         { /*End of list */ }
0a122b
     },
0a122b
@@ -4059,6 +4059,7 @@ int main(int argc, char **argv, char **envp)
0a122b
         }
0a122b
 
0a122b
         boot_menu = qemu_opt_get_bool(opts, "menu", boot_menu);
0a122b
+        boot_strict = qemu_opt_get_bool(opts, "strict", false);
0a122b
     }
0a122b
 
0a122b
     if (!kernel_cmdline) {
0a122b
-- 
0a122b
1.7.1
0a122b