aboutsummaryrefslogtreecommitdiffstats
path: root/android/main.c
diff options
context:
space:
mode:
authorMaciek Molerus <maciek@google.com>2011-06-15 22:26:35 +0200
committerMaciek Molerus <maciek@google.com>2011-06-17 17:33:40 +0200
commitf758411e012389b1d9699e10cae6f1ac98cca419 (patch)
tree2c9952b18a9cd5f5c737445fe802c615f4531f71 /android/main.c
parenta403d8a56953e68ea14f6bc5b28c8e667f0af267 (diff)
downloadexternal_qemu-f758411e012389b1d9699e10cae6f1ac98cca419.zip
external_qemu-f758411e012389b1d9699e10cae6f1ac98cca419.tar.gz
external_qemu-f758411e012389b1d9699e10cae6f1ac98cca419.tar.bz2
Fixes dataPartition size problem
Fixes the problem when disk.systemPartition.size avd setting gets overrided by default 66 MBytes hardcoded in qEmu. Change-Id: Ideb7ca172cb72076c83037f823b86ede2442d6f9
Diffstat (limited to 'android/main.c')
-rw-r--r--android/main.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/android/main.c b/android/main.c
index 77d3c69..29fc079 100644
--- a/android/main.c
+++ b/android/main.c
@@ -649,7 +649,10 @@ int main(int argc, char **argv)
hw->disk_dataPartition_initPath = NULL;
}
- uint64_t defaultBytes = defaultPartitionSize;
+ uint64_t defaultBytes =
+ hw->disk_dataPartition_size == 0 ?
+ defaultPartitionSize :
+ convertMBToBytes(hw->disk_dataPartition_size);
uint64_t dataBytes;
const char* dataPath = hw->disk_dataPartition_initPath;