* [Qemu-trivial] [PATCH] vl: Clean up unnecessary boot_order complications
@ 2013-10-01 11:47 ` armbru
0 siblings, 0 replies; 4+ messages in thread
From: armbru @ 2013-10-01 11:47 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, anthony
From: Markus Armbruster <armbru@redhat.com>
Messed up in commit 8281abd.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
vl.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/vl.c b/vl.c
index 983cdc6..7e1f408 100644
--- a/vl.c
+++ b/vl.c
@@ -2825,7 +2825,7 @@ int main(int argc, char **argv, char **envp)
const char *icount_option = NULL;
const char *initrd_filename;
const char *kernel_filename, *kernel_cmdline;
- const char *boot_order = NULL;
+ const char *boot_order;
DisplayState *ds;
int cyls, heads, secs, translation;
QemuOpts *hda_opts = NULL, *opts, *machine_opts;
@@ -4050,9 +4050,7 @@ int main(int argc, char **argv, char **envp)
initrd_filename = qemu_opt_get(machine_opts, "initrd");
kernel_cmdline = qemu_opt_get(machine_opts, "append");
- if (!boot_order) {
- boot_order = machine->default_boot_order;
- }
+ boot_order = machine->default_boot_order;
opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL);
if (opts) {
char *normal_boot_order;
--
1.8.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Qemu-devel] [PATCH] vl: Clean up unnecessary boot_order complications
@ 2013-10-01 11:47 ` armbru
0 siblings, 0 replies; 4+ messages in thread
From: armbru @ 2013-10-01 11:47 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, anthony
From: Markus Armbruster <armbru@redhat.com>
Messed up in commit 8281abd.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
vl.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/vl.c b/vl.c
index 983cdc6..7e1f408 100644
--- a/vl.c
+++ b/vl.c
@@ -2825,7 +2825,7 @@ int main(int argc, char **argv, char **envp)
const char *icount_option = NULL;
const char *initrd_filename;
const char *kernel_filename, *kernel_cmdline;
- const char *boot_order = NULL;
+ const char *boot_order;
DisplayState *ds;
int cyls, heads, secs, translation;
QemuOpts *hda_opts = NULL, *opts, *machine_opts;
@@ -4050,9 +4050,7 @@ int main(int argc, char **argv, char **envp)
initrd_filename = qemu_opt_get(machine_opts, "initrd");
kernel_cmdline = qemu_opt_get(machine_opts, "append");
- if (!boot_order) {
- boot_order = machine->default_boot_order;
- }
+ boot_order = machine->default_boot_order;
opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL);
if (opts) {
char *normal_boot_order;
--
1.8.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-trivial] [PATCH] vl: Clean up unnecessary boot_order complications
2013-10-01 11:47 ` [Qemu-devel] " armbru
@ 2013-10-02 16:35 ` Michael Tokarev
-1 siblings, 0 replies; 4+ messages in thread
From: Michael Tokarev @ 2013-10-02 16:35 UTC (permalink / raw)
To: armbru; +Cc: qemu-trivial, qemu-devel, anthony
01.10.2013 15:47, armbru@redhat.com пишет:
> From: Markus Armbruster <armbru@redhat.com>
>
> Messed up in commit 8281abd.
Thanks, applied to the trivial patches queue.
/mjt
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-10-02 16:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-01 11:47 [Qemu-trivial] [PATCH] vl: Clean up unnecessary boot_order complications armbru
2013-10-01 11:47 ` [Qemu-devel] " armbru
2013-10-02 16:35 ` [Qemu-trivial] " Michael Tokarev
2013-10-02 16:35 ` [Qemu-devel] " Michael Tokarev
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.