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