diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 15:47:18 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 15:47:18 -0800 |
| commit | a546c7006355a7bd1df4267ee53d0bfa2c017c8c (patch) | |
| tree | 01be0bf6c0d6968e1468ec9661fd52110f9b05a7 /android/main.c | |
| parent | baf3d7830396202df5cc47bd7bcee109c319cdb3 (diff) | |
| parent | 0f809250987b64f491bd3b4b73c0f0d33036a786 (diff) | |
| download | external_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.zip external_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.tar.gz external_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/qemu into mr1-staging
Change-Id: I8a4a71ac65b08e6e17f26c942f67a15b85211115
Diffstat (limited to 'android/main.c')
| -rw-r--r-- | android/main.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/android/main.c b/android/main.c index 51d481c..4178a6b 100644 --- a/android/main.c +++ b/android/main.c @@ -407,6 +407,9 @@ int main(int argc, char **argv) #elif defined(TARGET_I386) free(android_hw->hw_cpu_arch); android_hw->hw_cpu_arch = ASTRDUP("x86"); +#elif defined(TARGET_MIPS) + free(android_hw->hw_cpu_arch); + android_hw->hw_cpu_arch = ASTRDUP("mips"); #endif } @@ -723,6 +726,18 @@ int main(int argc, char **argv) } } + if (hw->disk_cachePartition_path && opts->cache_size) { + /* Set cache partition size per user options. */ + char* end; + long sizeMB = strtol(opts->cache_size, &end, 0); + + if (sizeMB < 0 || *end != 0) { + derror( "-cache-size must be followed by a positive integer" ); + exit(1); + } + hw->disk_cachePartition_size = (uint64_t) sizeMB * ONE_MB; + } + /** SD CARD PARTITION */ if (!hw->hw_sdCard) { |