diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-12-01 17:10:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-01 17:10:49 -0800 |
| commit | 8fa4d03021927c765331f1e320226ae4923e9f6e (patch) | |
| tree | a114e068aa1c940dd355464d82ca77cca0d723e6 /android | |
| parent | 018ce14ac3bbaa6d91a3c43668e03451ffd0e10d (diff) | |
| parent | 8b657e5deaa03b989b0b36791fcf2aa6b2882656 (diff) | |
| download | external_qemu-8fa4d03021927c765331f1e320226ae4923e9f6e.zip external_qemu-8fa4d03021927c765331f1e320226ae4923e9f6e.tar.gz external_qemu-8fa4d03021927c765331f1e320226ae4923e9f6e.tar.bz2 | |
am 8b657e5d: Fix a crash when using an 8MB SD Card image file.
Merge commit '8b657e5deaa03b989b0b36791fcf2aa6b2882656' into eclair-plus-aosp
* commit '8b657e5deaa03b989b0b36791fcf2aa6b2882656':
Fix a crash when using an 8MB SD Card image file.
Diffstat (limited to 'android')
| -rw-r--r-- | android/android.h | 2 | ||||
| -rw-r--r-- | android/main.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/android/android.h b/android/android.h index 6d092fd..b19d8d3 100644 --- a/android/android.h +++ b/android/android.h @@ -13,7 +13,7 @@ #define _qemu_android_h #define ANDROID_VERSION_MAJOR 1 -#define ANDROID_VERSION_MINOR 12 +#define ANDROID_VERSION_MINOR 14 #define CONFIG_SHAPER 1 diff --git a/android/main.c b/android/main.c index 7b20919..45ea968 100644 --- a/android/main.c +++ b/android/main.c @@ -2478,8 +2478,11 @@ int main(int argc, char **argv) uint64_t size; if (path_get_size(opts->sdcard, &size) == 0) { /* see if we have an sdcard image. get its size if it exists */ - if (size < 8*1024*1024ULL) { - fprintf(stderr, "### WARNING: SD Card files must be at least 8 MB, ignoring '%s'\n", opts->sdcard); + /* due to what looks like limitations of the MMC protocol, one has + * to use an SD Card image that is equal or larger than 9 MB + */ + if (size < 9*1024*1024ULL) { + fprintf(stderr, "### WARNING: SD Card files must be at least 9MB, ignoring '%s'\n", opts->sdcard); } else { args[n++] = "-hda"; args[n++] = opts->sdcard; |