commit 245874ab78e586f6ff0149cfc77df12403be8595
author Vladimir Chtchetkine <vchtchetkine@google.com> Thu Oct 13 11:16:38 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 13 11:16:38 2011 -0700
tree b15a41b09a153232d925896543479e965ae60131
parent 90a3681c1b2332093821a24c244bc3a86dbb1967
parent 955a99781dd7af82e7a55525a4e51ce5d0814021

Merge "Implemented Mac camera emulation"

hw/goldfish_nand.c

diff --git a/hw/goldfish_nand.c b/hw/goldfish_nand.c
index 49d575a..31e814b 100644
--- a/hw/goldfish_nand.c
+++ b/hw/goldfish_nand.c
@@ -795,7 +795,18 @@
     }
 
     if(rwfilename) {
-        rwfd = open(rwfilename, O_BINARY | (read_only ? O_RDONLY : O_RDWR));
+        if (initfilename) {
+            /* Overwrite with content of the 'initfilename'. */
+            if (read_only) {
+                /* Cannot be readonly when initializing the device from another file. */
+                XLOG("incompatible read only option is requested while initializing %.*s from %s\n",
+                     devname_len, devname, initfilename);
+                exit(1);
+            }
+            rwfd = open(rwfilename, O_BINARY | O_TRUNC | O_RDWR);
+        } else {
+            rwfd = open(rwfilename, O_BINARY | (read_only ? O_RDONLY : O_RDWR));
+        }
         if(rwfd < 0) {
             XLOG("could not open file %s, %s\n", rwfilename, strerror(errno));
             exit(1);