aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-07-07 04:40:27 +0200
committerDavid 'Digit' Turner <digit@android.com>2011-07-07 04:40:27 +0200
commitea2837728272b04bd236a74cd1ea547ec6f63c20 (patch)
treebf87e6b2202e15c6f6d185e3c393fd1a65bd2d85 /android
parent89329b3c3afc7f2c441b59cbf0658e6c8f688fea (diff)
downloadexternal_qemu-ea2837728272b04bd236a74cd1ea547ec6f63c20.zip
external_qemu-ea2837728272b04bd236a74cd1ea547ec6f63c20.tar.gz
external_qemu-ea2837728272b04bd236a74cd1ea547ec6f63c20.tar.bz2
Fix a small bug in the -sysdir handling.
The issue was that auto-configuration would set the value of -system to point to the full path of the system image (e.g. <sysdir>/system.img). Later, the emulator would try to load the <sysdir>/<sysdir>/system.img due to this. Change-Id: Id77ea9bdc55bb99c1bfbd2ade291ec41f31ec65d
Diffstat (limited to 'android')
-rw-r--r--android/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/main.c b/android/main.c
index cd3fd08..f20ea7b 100644
--- a/android/main.c
+++ b/android/main.c
@@ -549,7 +549,7 @@ int main(int argc, char **argv)
}
/* If -system <name> is used, use it to find the initial image */
- if (opts->sysdir != NULL) {
+ if (opts->sysdir != NULL && !path_exists(opts->system)) {
initImage = _getFullFilePath(opts->sysdir, opts->system);
} else {
initImage = ASTRDUP(opts->system);