diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-04-10 03:35:40 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-04-10 03:35:41 -0700 |
| commit | b12c531a21d1e6edcc28dcfcd4ea63bd36db30c1 (patch) | |
| tree | 6a0eb95aabb1761b8fc377857f6325cbe0934252 /hw | |
| parent | 6d21c4a62c5040dfd7b57eeb4e6eddc4bd65f4ee (diff) | |
| parent | 663d101937e86e2551fdca2cdd10db5b1fcbc7e7 (diff) | |
| download | external_qemu-b12c531a21d1e6edcc28dcfcd4ea63bd36db30c1.zip external_qemu-b12c531a21d1e6edcc28dcfcd4ea63bd36db30c1.tar.gz external_qemu-b12c531a21d1e6edcc28dcfcd4ea63bd36db30c1.tar.bz2 | |
Merge "Fix save restore for nand device"
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/goldfish_nand.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ typedef struct { * 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_BEGIN(nand_dev_controller_state_fields) 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 |