aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-08-11 19:49:03 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-08-11 19:49:03 -0500
commit346fe0c4c0b88f11a3d0c01c34d9a170d73429cc (patch)
tree699be308892b0a9c1f31d8025c092a99f3418b00 /vl.c
parent53810bab3acd73b9844807e53f02d867c1ad1d2a (diff)
parentb90372ad2a69a9cdad2a40766eb46f0a89d98535 (diff)
downloadqemu-346fe0c4c0b88f11a3d0c01c34d9a170d73429cc.zip
qemu-346fe0c4c0b88f11a3d0c01c34d9a170d73429cc.tar.gz
qemu-346fe0c4c0b88f11a3d0c01c34d9a170d73429cc.tar.bz2
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* 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
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/vl.c b/vl.c
index ad9b036..91076f0 100644
--- a/vl.c
+++ b/vl.c
@@ -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.