| Message ID | 1320939332-31871-1-git-send-email-andreas.faerber@web.de |
|---|---|
| State | New |
| Headers | show |
On 11/10/2011 09:35 AM, Andreas Färber wrote: > machine defaults to find_default_machine(), > then gets overridden via -M and machine_parse(). > > If no -M is specified and find_default_machine() returns NULL > (when no machine compiled in), exit with an error. > > Avoids a segfault when setting machine->max_cpus. > > Signed-off-by: Andreas Färber<andreas.faerber@web.de> Applied. Thanks. Regards, Anthony Liguori > --- > vl.c | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/vl.c b/vl.c > index f169aac..16fa222 100644 > --- a/vl.c > +++ b/vl.c > @@ -3089,6 +3089,11 @@ 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.
diff --git a/vl.c b/vl.c index f169aac..16fa222 100644 --- a/vl.c +++ b/vl.c @@ -3089,6 +3089,11 @@ 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.
machine defaults to find_default_machine(), then gets overridden via -M and machine_parse(). If no -M is specified and find_default_machine() returns NULL (when no machine compiled in), exit with an error. Avoids a segfault when setting machine->max_cpus. Signed-off-by: Andreas Färber <andreas.faerber@web.de> --- vl.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)