aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2012-03-14 13:23:33 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-14 13:23:33 -0700
commita89252fb1e98161e9c5d4c1506eddda7dc93e6f8 (patch)
treec220fdab87bbfdbec73d836138cf39626f871e58
parentd4f5a3ae87a7246613188940c1667bf2880da402 (diff)
parent873c3cb5688092d2822837511cfb2b330d265801 (diff)
downloadexternal_qemu-a89252fb1e98161e9c5d4c1506eddda7dc93e6f8.zip
external_qemu-a89252fb1e98161e9c5d4c1506eddda7dc93e6f8.tar.gz
external_qemu-a89252fb1e98161e9c5d4c1506eddda7dc93e6f8.tar.bz2
Merge "Fix snapshot autoconfig"
-rw-r--r--android/avd/info.c9
-rw-r--r--android/avd/info.h9
-rw-r--r--android/main.c2
3 files changed, 19 insertions, 1 deletions
diff --git a/android/avd/info.c b/android/avd/info.c
index 7fd8cc4..f850f5b 100644
--- a/android/avd/info.c
+++ b/android/avd/info.c
@@ -1207,3 +1207,12 @@ int avdInfo_getAdbdCommunicationMode( AvdInfo* i )
{
return path_getAdbdCommunicationMode(i->androidOut);
}
+
+int avdInfo_getSnapshotPresent(AvdInfo* i)
+{
+ if (i->configIni == NULL) {
+ return 0;
+ } else {
+ return iniFile_getBoolean(i->configIni, "snapshot.present", "no");
+ }
+}
diff --git a/android/avd/info.h b/android/avd/info.h
index 74a9b01..11f4897 100644
--- a/android/avd/info.h
+++ b/android/avd/info.h
@@ -252,6 +252,15 @@ const char* avdInfo_getCoreHwIniPath( AvdInfo* i );
*/
int avdInfo_getAdbdCommunicationMode( AvdInfo* i );
+/* Returns config.ini snapshot presense status.
+ * This routine checks if snapshots are enabled in AVD config.ini file.
+ * Return:
+ * 1 - Snapshots are enabled in AVD config.ini file.
+ * 0 - Snapshots are disabled in AVD config.ini file, of config.ini file is not
+ * found.
+*/
+int avdInfo_getSnapshotPresent(AvdInfo* i);
+
/* */
#endif /* ANDROID_AVD_INFO_H */
diff --git a/android/main.c b/android/main.c
index d3e7e8f..bd5a2fc 100644
--- a/android/main.c
+++ b/android/main.c
@@ -853,7 +853,7 @@ int main(int argc, char **argv)
}
else
{
- if (!opts->snapstorage) {
+ if (!opts->snapstorage && avdInfo_getSnapshotPresent(avd)) {
opts->snapstorage = avdInfo_getSnapStoragePath(avd);
if (opts->snapstorage != NULL) {
D("autoconfig: -snapstorage %s", opts->snapstorage);