Message ID | 1344495471-3957-1-git-send-email-riegamaths@gmail.com |
---|---|
State | New |
Headers | show |
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
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.