diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-04 16:45:17 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-04 16:45:17 -0500 |
| commit | 47bf05d7eb550905c635724ce72f855fb4e10b3d (patch) | |
| tree | 31434e7500bea51fe188091ee6b5f4bbd5b8c212 /block/qcow2.h | |
| parent | d138cee907b36f217ad030fb2c75c027b7d5731b (diff) | |
| parent | e7a8a7837a964e0fe327e6ef8dde02c6a53dd14a (diff) | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'block/qcow2.h')
| -rw-r--r-- | block/qcow2.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/block/qcow2.h b/block/qcow2.h index 6a0a21b694..de23abe1a4 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -26,6 +26,7 @@ #define BLOCK_QCOW2_H #include "aes.h" +#include "qemu-coroutine.h" //#define DEBUG_ALLOC //#define DEBUG_ALLOC2 @@ -114,6 +115,8 @@ typedef struct BDRVQcowState { int64_t free_cluster_index; int64_t free_byte_offset; + CoMutex lock; + uint32_t crypt_method; /* current crypt method, 0 if no key yet */ uint32_t crypt_method_header; AES_KEY aes_encrypt_key; @@ -146,7 +149,7 @@ typedef struct QCowL2Meta int nb_available; int nb_clusters; struct QCowL2Meta *depends_on; - QLIST_HEAD(QCowAioDependencies, QCowAIOCB) dependent_requests; + CoQueue dependent_requests; QLIST_ENTRY(QCowL2Meta) next_in_flight; } QCowL2Meta; |