commit b12c531a21d1e6edcc28dcfcd4ea63bd36db30c1
author Andrew Hsieh <andrewhsieh@google.com> Tue Apr 10 03:35:40 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Tue Apr 10 03:35:41 2012 -0700
tree 6a0eb95aabb1761b8fc377857f6325cbe0934252
parent 6d21c4a62c5040dfd7b57eeb4e6eddc4bd65f4ee
parent 663d101937e86e2551fdca2cdd10db5b1fcbc7e7

Merge "Fix save restore for nand device"

hw/goldfish_nand.c

diff --git a/hw/goldfish_nand.c b/hw/goldfish_nand.c
index 31e814b..55f77f6 100644
--- a/hw/goldfish_nand.c
+++ b/hw/goldfish_nand.c
@@ -140,7 +140,7 @@
  * 2: saving actual disk contents as well
  * 3: use the correct data length and truncate to avoid padding.
  */
-#define  NAND_DEV_STATE_SAVE_VERSION  3
+#define  NAND_DEV_STATE_SAVE_VERSION  4
 
 #define  QFIELD_STRUCT  nand_dev_controller_state
 QFIELD_BEGIN(nand_dev_controller_state_fields)
@@ -149,6 +149,8 @@
     QFIELD_INT32(addr_high),
     QFIELD_INT32(transfer_size),
     QFIELD_INT32(data),
+    QFIELD_INT32(batch_addr_low),
+    QFIELD_INT32(batch_addr_high),
     QFIELD_INT32(result),
 QFIELD_END