diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-31 11:09:00 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-31 11:09:00 -0500 |
| commit | 8494a397b68124f9898e7912173d460ee99ba3e2 (patch) | |
| tree | 2c3ff12f56cb2587d00bab448a226d3cf0042d64 /docs | |
| parent | d439b79d730bf219e47c14ab94f1546bcc5045ab (diff) | |
| parent | 336a6915bc7089fb20fea4ba99972ad9a97c5f52 (diff) | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
Conflicts:
block/vmdk.c
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/specs/qcow2.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/specs/qcow2.txt b/docs/specs/qcow2.txt index 8fc3cb2f1a..e792953c8f 100644 --- a/docs/specs/qcow2.txt +++ b/docs/specs/qcow2.txt @@ -108,8 +108,8 @@ as follows: refcount_block_entries = (cluster_size / sizeof(uint16_t)) - refcount_block_index = (offset / cluster_size) % refcount_table_entries - refcount_table_index = (offset / cluster_size) / refcount_table_entries + refcount_block_index = (offset / cluster_size) % refcount_block_entries + refcount_table_index = (offset / cluster_size) / refcount_block_entries refcount_block = load_cluster(refcount_table[refcount_table_index]); return refcount_block[refcount_block_index]; @@ -211,7 +211,7 @@ switch the active L1 table, so that a different set of host clusters are exposed to the guest. When creating a snapshot, the L1 table should be copied and the refcount of all -L2 tables and clusters reachable form this L1 table must be increased, so that +L2 tables and clusters reachable from this L1 table must be increased, so that a write causes a COW and isn't visible in other snapshots. When loading a snapshot, bit 63 of all entries in the new active L1 table and |