motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 07:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

Browse source 
* stefanha/trivial-patches:
  target-arm: Fix typos in comments
  arm: translate: comment typo - s/middel/middle/
  vl.c: Exit QEMU early if no machine is found
This commit is contained in:
Anthony Liguori 2012-08-11 19:49:03 -05:00
commit 346fe0c4c0
7 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
vl.c
View file

@ -3209,6 +3209,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);
}
@ -3251,11 +3256,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.