diff options
| author |   Kevin Wolf <kwolf@redhat.com> | 2009-10-22 17:54:42 +0200 |
|---|---|---|
| committer |   Anthony Liguori <aliguori@us.ibm.com> | 2009-10-27 12:28:59 -0500 |
| commit | 72ecf02d7d1c765c78932649bb206ab8a9972a2b (patch) | |
| tree | c91519c32a8952152d5a2cd449561e5899f67a8c /block/qcow2-cluster.c | |
| parent | linux-aio: Honour AsyncContext (diff) | |
| download | qemu-kvm-72ecf02d7d1c765c78932649bb206ab8a9972a2b.tar.gz qemu-kvm-72ecf02d7d1c765c78932649bb206ab8a9972a2b.tar.bz2 qemu-kvm-72ecf02d7d1c765c78932649bb206ab8a9972a2b.zip | |
Revert "qcow2: Bring synchronous read/write back to life"
It was merely a workaround and the real fix is done now.
This reverts commit ef845c3bf421290153154635dc18eaa677cecb43.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'block/qcow2-cluster.c')
| -rw-r--r-- | block/qcow2-cluster.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index a7de82012..e444e53e1 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -306,8 +306,8 @@ void qcow2_encrypt_sectors(BDRVQcowState *s, int64_t sector_num, } -int qcow2_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, - int nb_sectors) +static int qcow_read(BlockDriverState *bs, int64_t sector_num, + uint8_t *buf, int nb_sectors) { BDRVQcowState *s = bs->opaque; int ret, index_in_cluster, n, n1; @@ -358,7 +358,7 @@ static int copy_sectors(BlockDriverState *bs, uint64_t start_sect, n = n_end - n_start; if (n <= 0) return 0; - ret = qcow2_read(bs, start_sect + n_start, s->cluster_data, n); + ret = qcow_read(bs, start_sect + n_start, s->cluster_data, n); if (ret < 0) return ret; if (s->crypt_method) { |