* [Qemu-devel] [RESEND PATCH] vl.c: Exit QEMU early if no machine is found
@ 2012-08-09 6:57 riegamaths
2012-08-09 9:19 ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
0 siblings, 1 reply; 2+ messages in thread
From: riegamaths @ 2012-08-09 6:57 UTC (permalink / raw)
To: qemu-trivial; +Cc: Anthony Liguori, qemu-devel, Dunrong Huang, Stefan Hajnoczi
From: Dunrong Huang <riegamaths@gmail.com>
We check whether the variable machine is NULL or not before accessing
it. If machine is NULL, exit QEMU with an error, this can avoids a
segfault error.
Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
---
vl.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/vl.c b/vl.c
index e71cb30..1596617 100644
--- a/vl.c
+++ b/vl.c
@@ -3204,6 +3204,11 @@ int main(int argc, char **argv, char **envp)
}
loc_set_none();
+ if (machine == NULL) {
+ fprintf(stderr, "No machine found.\n");
+ exit(1);
+ }
+
if (machine->hw_version) {
qemu_set_version(machine->hw_version);
}
@@ -3246,11 +3251,6 @@ int main(int argc, char **argv, char **envp)
data_dir = CONFIG_QEMU_DATADIR;
}
- if (machine == NULL) {
- fprintf(stderr, "No machine found.\n");
- exit(1);
- }
-
/*
* Default to max_cpus = smp_cpus, in case the user doesn't
* specify a max_cpus value.
--
1.7.8.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [Qemu-trivial] [RESEND PATCH] vl.c: Exit QEMU early if no machine is found
2012-08-09 6:57 [Qemu-devel] [RESEND PATCH] vl.c: Exit QEMU early if no machine is found riegamaths
@ 2012-08-09 9:19 ` Stefan Hajnoczi
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Hajnoczi @ 2012-08-09 9:19 UTC (permalink / raw)
To: riegamaths; +Cc: qemu-trivial, Anthony Liguori, qemu-devel, Stefan Hajnoczi
On Thu, Aug 9, 2012 at 7:57 AM, <riegamaths@gmail.com> wrote:
> From: Dunrong Huang <riegamaths@gmail.com>
>
> We check whether the variable machine is NULL or not before accessing
> it. If machine is NULL, exit QEMU with an error, this can avoids a
> segfault error.
>
> Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
> ---
> vl.c | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
Applied to the trivial-patches tree in the other email thread.
Stefan
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-08-09 9:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-09 6:57 [Qemu-devel] [RESEND PATCH] vl.c: Exit QEMU early if no machine is found riegamaths
2012-08-09 9:19 ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).