Skip to content

Q
qemu

openeuler / qemu

通知 10
Star 0
Fork 0
Q
qemu

体验新版 GitCode，发现更多精彩内容 >>

提交 7c80ab3f 编写于 作者: J Jes Sorensen 提交者： Kevin Wolf
浏览文件
操作

block/qcow2.c: rename qcow_ functions to qcow2_ 

It doesn't really make sense for functions in qcow2.c to be named
qcow_ so convert the names to match correctly.
Signed-off-by: NJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
上级 01979a98
显示空白变更内容
内联 并排
Showing with 104 addition and 98 deletion
block/qcow2-cluster.c
浏览文件 @ 7c80ab3f
...@@ -352,7 +352,7 @@ void qcow2_encrypt_sectors(BDRVQcowState *s, int64_t sector_num, ...@@ -352,7 +352,7 @@ void qcow2_encrypt_sectors(BDRVQcowState *s, int64_t sector_num,
} }
static int qcow_read(BlockDriverState *bs, int64_t sector_num, static int qcow2_read(BlockDriverState *bs, int64_t sector_num,
uint8_t *buf, int nb_sectors) uint8_t *buf, int nb_sectors)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
...@@ -419,7 +419,7 @@ static int copy_sectors(BlockDriverState *bs, uint64_t start_sect, ...@@ -419,7 +419,7 @@ static int copy_sectors(BlockDriverState *bs, uint64_t start_sect,
if (n <= 0) if (n <= 0)
return 0; return 0;
BLKDBG_EVENT(bs->file, BLKDBG_COW_READ); BLKDBG_EVENT(bs->file, BLKDBG_COW_READ);
ret = qcow_read(bs, start_sect + n_start, s->cluster_data, n); ret = qcow2_read(bs, start_sect + n_start, s->cluster_data, n);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (s->crypt_method) { if (s->crypt_method) {
......
block/qcow2-snapshot.c
浏览文件 @ 7c80ab3f
...@@ -116,7 +116,7 @@ int qcow2_read_snapshots(BlockDriverState *bs) ...@@ -116,7 +116,7 @@ int qcow2_read_snapshots(BlockDriverState *bs)
} }
/* add at the end of the file a new list of snapshots */ /* add at the end of the file a new list of snapshots */
static int qcow_write_snapshots(BlockDriverState *bs) static int qcow2_write_snapshots(BlockDriverState *bs)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
QCowSnapshot *sn; QCowSnapshot *sn;
...@@ -300,7 +300,7 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) ...@@ -300,7 +300,7 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
s->snapshots = snapshots1; s->snapshots = snapshots1;
s->snapshots[s->nb_snapshots++] = *sn; s->snapshots[s->nb_snapshots++] = *sn;
if (qcow_write_snapshots(bs) < 0) if (qcow2_write_snapshots(bs) < 0)
goto fail; goto fail;
#ifdef DEBUG_ALLOC #ifdef DEBUG_ALLOC
qcow2_check_refcounts(bs); qcow2_check_refcounts(bs);
...@@ -378,7 +378,7 @@ int qcow2_snapshot_delete(BlockDriverState *bs, const char *snapshot_id) ...@@ -378,7 +378,7 @@ int qcow2_snapshot_delete(BlockDriverState *bs, const char *snapshot_id)
qemu_free(sn->name); qemu_free(sn->name);
memmove(sn, sn + 1, (s->nb_snapshots - snapshot_index - 1) * sizeof(*sn)); memmove(sn, sn + 1, (s->nb_snapshots - snapshot_index - 1) * sizeof(*sn));
s->nb_snapshots--; s->nb_snapshots--;
ret = qcow_write_snapshots(bs); ret = qcow2_write_snapshots(bs);
if (ret < 0) { if (ret < 0) {
/* XXX: restore snapshot if error ? */ /* XXX: restore snapshot if error ? */
return ret; return ret;
......
block/qcow2.c
浏览文件 @ 7c80ab3f
...@@ -50,10 +50,10 @@ typedef struct { ...@@ -50,10 +50,10 @@ typedef struct {
uint32_t magic; uint32_t magic;
uint32_t len; uint32_t len;
} QCowExtension; } QCowExtension;
#define QCOW_EXT_MAGIC_END 0 #define QCOW2_EXT_MAGIC_END 0
#define QCOW_EXT_MAGIC_BACKING_FORMAT 0xE2792ACA #define QCOW2_EXT_MAGIC_BACKING_FORMAT 0xE2792ACA
static int qcow_probe(const uint8_t *buf, int buf_size, const char *filename) static int qcow2_probe(const uint8_t *buf, int buf_size, const char *filename)
{ {
const QCowHeader *cow_header = (const void *)buf; const QCowHeader *cow_header = (const void *)buf;
...@@ -73,14 +73,14 @@ static int qcow_probe(const uint8_t *buf, int buf_size, const char *filename) ...@@ -73,14 +73,14 @@ static int qcow_probe(const uint8_t *buf, int buf_size, const char *filename)
* unknown magic is skipped (future extension this version knows nothing about) * unknown magic is skipped (future extension this version knows nothing about)
* return 0 upon success, non-0 otherwise * return 0 upon success, non-0 otherwise
*/ */
static int qcow_read_extensions(BlockDriverState *bs, uint64_t start_offset, static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
uint64_t end_offset) uint64_t end_offset)
{ {
QCowExtension ext; QCowExtension ext;
uint64_t offset; uint64_t offset;
#ifdef DEBUG_EXT #ifdef DEBUG_EXT
printf("qcow_read_extensions: start=%ld end=%ld\n", start_offset, end_offset); printf("qcow2_read_extensions: start=%ld end=%ld\n", start_offset, end_offset);
#endif #endif
offset = start_offset; offset = start_offset;
while (offset < end_offset) { while (offset < end_offset) {
...@@ -88,13 +88,13 @@ static int qcow_read_extensions(BlockDriverState *bs, uint64_t start_offset, ...@@ -88,13 +88,13 @@ static int qcow_read_extensions(BlockDriverState *bs, uint64_t start_offset,
#ifdef DEBUG_EXT #ifdef DEBUG_EXT
/* Sanity check */ /* Sanity check */
if (offset > s->cluster_size) if (offset > s->cluster_size)
printf("qcow_handle_extension: suspicious offset %lu\n", offset); printf("qcow2_read_extension: suspicious offset %lu\n", offset);
printf("attemting to read extended header in offset %lu\n", offset); printf("attemting to read extended header in offset %lu\n", offset);
#endif #endif
if (bdrv_pread(bs->file, offset, &ext, sizeof(ext)) != sizeof(ext)) { if (bdrv_pread(bs->file, offset, &ext, sizeof(ext)) != sizeof(ext)) {
fprintf(stderr, "qcow_handle_extension: ERROR: " fprintf(stderr, "qcow2_read_extension: ERROR: "
"pread fail from offset %" PRIu64 "\n", "pread fail from offset %" PRIu64 "\n",
offset); offset);
return 1; return 1;
...@@ -106,10 +106,10 @@ static int qcow_read_extensions(BlockDriverState *bs, uint64_t start_offset, ...@@ -106,10 +106,10 @@ static int qcow_read_extensions(BlockDriverState *bs, uint64_t start_offset,
printf("ext.magic = 0x%x\n", ext.magic); printf("ext.magic = 0x%x\n", ext.magic);
#endif #endif
switch (ext.magic) { switch (ext.magic) {
case QCOW_EXT_MAGIC_END: case QCOW2_EXT_MAGIC_END:
return 0; return 0;
case QCOW_EXT_MAGIC_BACKING_FORMAT: case QCOW2_EXT_MAGIC_BACKING_FORMAT:
if (ext.len >= sizeof(bs->backing_format)) { if (ext.len >= sizeof(bs->backing_format)) {
fprintf(stderr, "ERROR: ext_backing_format: len=%u too large" fprintf(stderr, "ERROR: ext_backing_format: len=%u too large"
" (>=%zu)\n", " (>=%zu)\n",
...@@ -137,7 +137,7 @@ static int qcow_read_extensions(BlockDriverState *bs, uint64_t start_offset, ...@@ -137,7 +137,7 @@ static int qcow_read_extensions(BlockDriverState *bs, uint64_t start_offset,
} }
static int qcow_open(BlockDriverState *bs, int flags) static int qcow2_open(BlockDriverState *bs, int flags)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
int len, i; int len, i;
...@@ -222,7 +222,7 @@ static int qcow_open(BlockDriverState *bs, int flags) ...@@ -222,7 +222,7 @@ static int qcow_open(BlockDriverState *bs, int flags)
ext_end = header.backing_file_offset; ext_end = header.backing_file_offset;
else else
ext_end = s->cluster_size; ext_end = s->cluster_size;
if (qcow_read_extensions(bs, sizeof(header), ext_end)) if (qcow2_read_extensions(bs, sizeof(header), ext_end))
goto fail; goto fail;
/* read the backing file name */ /* read the backing file name */
...@@ -252,7 +252,7 @@ static int qcow_open(BlockDriverState *bs, int flags) ...@@ -252,7 +252,7 @@ static int qcow_open(BlockDriverState *bs, int flags)
return -1; return -1;
} }
static int qcow_set_key(BlockDriverState *bs, const char *key) static int qcow2_set_key(BlockDriverState *bs, const char *key)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
uint8_t keybuf[16]; uint8_t keybuf[16];
...@@ -294,7 +294,7 @@ static int qcow_set_key(BlockDriverState *bs, const char *key) ...@@ -294,7 +294,7 @@ static int qcow_set_key(BlockDriverState *bs, const char *key)
return 0; return 0;
} }
static int qcow_is_allocated(BlockDriverState *bs, int64_t sector_num, static int qcow2_is_allocated(BlockDriverState *bs, int64_t sector_num,
int nb_sectors, int *pnum) int nb_sectors, int *pnum)
{ {
uint64_t cluster_offset; uint64_t cluster_offset;
...@@ -344,7 +344,7 @@ typedef struct QCowAIOCB { ...@@ -344,7 +344,7 @@ typedef struct QCowAIOCB {
QLIST_ENTRY(QCowAIOCB) next_depend; QLIST_ENTRY(QCowAIOCB) next_depend;
} QCowAIOCB; } QCowAIOCB;
static void qcow_aio_cancel(BlockDriverAIOCB *blockacb) static void qcow2_aio_cancel(BlockDriverAIOCB *blockacb)
{ {
QCowAIOCB *acb = container_of(blockacb, QCowAIOCB, common); QCowAIOCB *acb = container_of(blockacb, QCowAIOCB, common);
if (acb->hd_aiocb) if (acb->hd_aiocb)
...@@ -352,21 +352,21 @@ static void qcow_aio_cancel(BlockDriverAIOCB *blockacb) ...@@ -352,21 +352,21 @@ static void qcow_aio_cancel(BlockDriverAIOCB *blockacb)
qemu_aio_release(acb); qemu_aio_release(acb);
} }
static AIOPool qcow_aio_pool = { static AIOPool qcow2_aio_pool = {
.aiocb_size = sizeof(QCowAIOCB), .aiocb_size = sizeof(QCowAIOCB),
.cancel = qcow_aio_cancel, .cancel = qcow2_aio_cancel,
}; };
static void qcow_aio_read_cb(void *opaque, int ret); static void qcow2_aio_read_cb(void *opaque, int ret);
static void qcow_aio_read_bh(void *opaque) static void qcow2_aio_read_bh(void *opaque)
{ {
QCowAIOCB *acb = opaque; QCowAIOCB *acb = opaque;
qemu_bh_delete(acb->bh); qemu_bh_delete(acb->bh);
acb->bh = NULL; acb->bh = NULL;
qcow_aio_read_cb(opaque, 0); qcow2_aio_read_cb(opaque, 0);
} }
static int qcow_schedule_bh(QEMUBHFunc *cb, QCowAIOCB *acb) static int qcow2_schedule_bh(QEMUBHFunc *cb, QCowAIOCB *acb)
{ {
if (acb->bh) if (acb->bh)
return -EIO; return -EIO;
...@@ -380,7 +380,7 @@ static int qcow_schedule_bh(QEMUBHFunc *cb, QCowAIOCB *acb) ...@@ -380,7 +380,7 @@ static int qcow_schedule_bh(QEMUBHFunc *cb, QCowAIOCB *acb)
return 0; return 0;
} }
static void qcow_aio_read_cb(void *opaque, int ret) static void qcow2_aio_read_cb(void *opaque, int ret)
{ {
QCowAIOCB *acb = opaque; QCowAIOCB *acb = opaque;
BlockDriverState *bs = acb->common.bs; BlockDriverState *bs = acb->common.bs;
...@@ -447,18 +447,18 @@ static void qcow_aio_read_cb(void *opaque, int ret) ...@@ -447,18 +447,18 @@ static void qcow_aio_read_cb(void *opaque, int ret)
BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO); BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);
acb->hd_aiocb = bdrv_aio_readv(bs->backing_hd, acb->sector_num, acb->hd_aiocb = bdrv_aio_readv(bs->backing_hd, acb->sector_num,
&acb->hd_qiov, acb->cur_nr_sectors, &acb->hd_qiov, acb->cur_nr_sectors,
qcow_aio_read_cb, acb); qcow2_aio_read_cb, acb);
if (acb->hd_aiocb == NULL) if (acb->hd_aiocb == NULL)
goto done; goto done;
} else { } else {
ret = qcow_schedule_bh(qcow_aio_read_bh, acb); ret = qcow2_schedule_bh(qcow2_aio_read_bh, acb);
if (ret < 0) if (ret < 0)
goto done; goto done;
} }
} else { } else {
/* Note: in this case, no need to wait */ /* Note: in this case, no need to wait */
qemu_iovec_memset(&acb->hd_qiov, 0, 512 * acb->cur_nr_sectors); qemu_iovec_memset(&acb->hd_qiov, 0, 512 * acb->cur_nr_sectors);
ret = qcow_schedule_bh(qcow_aio_read_bh, acb); ret = qcow2_schedule_bh(qcow2_aio_read_bh, acb);
if (ret < 0) if (ret < 0)
goto done; goto done;
} }
...@@ -471,7 +471,7 @@ static void qcow_aio_read_cb(void *opaque, int ret) ...@@ -471,7 +471,7 @@ static void qcow_aio_read_cb(void *opaque, int ret)
s->cluster_cache + index_in_cluster * 512, s->cluster_cache + index_in_cluster * 512,
512 * acb->cur_nr_sectors); 512 * acb->cur_nr_sectors);
ret = qcow_schedule_bh(qcow_aio_read_bh, acb); ret = qcow2_schedule_bh(qcow2_aio_read_bh, acb);
if (ret < 0) if (ret < 0)
goto done; goto done;
} else { } else {
...@@ -501,7 +501,7 @@ static void qcow_aio_read_cb(void *opaque, int ret) ...@@ -501,7 +501,7 @@ static void qcow_aio_read_cb(void *opaque, int ret)
acb->hd_aiocb = bdrv_aio_readv(bs->file, acb->hd_aiocb = bdrv_aio_readv(bs->file,
(acb->cluster_offset >> 9) + index_in_cluster, (acb->cluster_offset >> 9) + index_in_cluster,
&acb->hd_qiov, acb->cur_nr_sectors, &acb->hd_qiov, acb->cur_nr_sectors,
qcow_aio_read_cb, acb); qcow2_aio_read_cb, acb);
if (acb->hd_aiocb == NULL) { if (acb->hd_aiocb == NULL) {
ret = -EIO; ret = -EIO;
goto done; goto done;
...@@ -515,13 +515,14 @@ done: ...@@ -515,13 +515,14 @@ done:
qemu_aio_release(acb); qemu_aio_release(acb);
} }
static QCowAIOCB *qcow_aio_setup(BlockDriverState *bs, static QCowAIOCB *qcow2_aio_setup(BlockDriverState *bs, int64_t sector_num,
int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, QEMUIOVector *qiov, int nb_sectors,
BlockDriverCompletionFunc *cb, void *opaque, int is_write) BlockDriverCompletionFunc *cb,
void *opaque, int is_write)
{ {
QCowAIOCB *acb; QCowAIOCB *acb;
acb = qemu_aio_get(&qcow_aio_pool, bs, cb, opaque); acb = qemu_aio_get(&qcow2_aio_pool, bs, cb, opaque);
if (!acb) if (!acb)
return NULL; return NULL;
acb->hd_aiocb = NULL; acb->hd_aiocb = NULL;
...@@ -539,21 +540,23 @@ static QCowAIOCB *qcow_aio_setup(BlockDriverState *bs, ...@@ -539,21 +540,23 @@ static QCowAIOCB *qcow_aio_setup(BlockDriverState *bs,
return acb; return acb;
} }
static BlockDriverAIOCB *qcow_aio_readv(BlockDriverState *bs, static BlockDriverAIOCB *qcow2_aio_readv(BlockDriverState *bs,
int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, int64_t sector_num,
BlockDriverCompletionFunc *cb, void *opaque) QEMUIOVector *qiov, int nb_sectors,
BlockDriverCompletionFunc *cb,
void *opaque)
{ {
QCowAIOCB *acb; QCowAIOCB *acb;
acb = qcow_aio_setup(bs, sector_num, qiov, nb_sectors, cb, opaque, 0); acb = qcow2_aio_setup(bs, sector_num, qiov, nb_sectors, cb, opaque, 0);
if (!acb) if (!acb)
return NULL; return NULL;
qcow_aio_read_cb(acb, 0); qcow2_aio_read_cb(acb, 0);
return &acb->common; return &acb->common;
} }
static void qcow_aio_write_cb(void *opaque, int ret); static void qcow2_aio_write_cb(void *opaque, int ret);
static void run_dependent_requests(QCowL2Meta *m) static void run_dependent_requests(QCowL2Meta *m)
{ {
...@@ -567,14 +570,14 @@ static void run_dependent_requests(QCowL2Meta *m) ...@@ -567,14 +570,14 @@ static void run_dependent_requests(QCowL2Meta *m)
/* Restart all dependent requests */ /* Restart all dependent requests */
QLIST_FOREACH_SAFE(req, &m->dependent_requests, next_depend, next) { QLIST_FOREACH_SAFE(req, &m->dependent_requests, next_depend, next) {
qcow_aio_write_cb(req, 0); qcow2_aio_write_cb(req, 0);
} }
/* Empty the list for the next part of the request */ /* Empty the list for the next part of the request */
QLIST_INIT(&m->dependent_requests); QLIST_INIT(&m->dependent_requests);
} }
static void qcow_aio_write_cb(void *opaque, int ret) static void qcow2_aio_write_cb(void *opaque, int ret)
{ {
QCowAIOCB *acb = opaque; QCowAIOCB *acb = opaque;
BlockDriverState *bs = acb->common.bs; BlockDriverState *bs = acb->common.bs;
...@@ -651,7 +654,7 @@ static void qcow_aio_write_cb(void *opaque, int ret) ...@@ -651,7 +654,7 @@ static void qcow_aio_write_cb(void *opaque, int ret)
acb->hd_aiocb = bdrv_aio_writev(bs->file, acb->hd_aiocb = bdrv_aio_writev(bs->file,
(acb->cluster_offset >> 9) + index_in_cluster, (acb->cluster_offset >> 9) + index_in_cluster,
&acb->hd_qiov, acb->cur_nr_sectors, &acb->hd_qiov, acb->cur_nr_sectors,
qcow_aio_write_cb, acb); qcow2_aio_write_cb, acb);
if (acb->hd_aiocb == NULL) { if (acb->hd_aiocb == NULL) {
ret = -EIO; ret = -EIO;
goto fail; goto fail;
...@@ -669,24 +672,26 @@ done: ...@@ -669,24 +672,26 @@ done:
qemu_aio_release(acb); qemu_aio_release(acb);
} }
static BlockDriverAIOCB *qcow_aio_writev(BlockDriverState *bs, static BlockDriverAIOCB *qcow2_aio_writev(BlockDriverState *bs,
int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, int64_t sector_num,
BlockDriverCompletionFunc *cb, void *opaque) QEMUIOVector *qiov, int nb_sectors,
BlockDriverCompletionFunc *cb,
void *opaque)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
QCowAIOCB *acb; QCowAIOCB *acb;
s->cluster_cache_offset = -1; /* disable compressed cache */ s->cluster_cache_offset = -1; /* disable compressed cache */
acb = qcow_aio_setup(bs, sector_num, qiov, nb_sectors, cb, opaque, 1); acb = qcow2_aio_setup(bs, sector_num, qiov, nb_sectors, cb, opaque, 1);
if (!acb) if (!acb)
return NULL; return NULL;
qcow_aio_write_cb(acb, 0); qcow2_aio_write_cb(acb, 0);
return &acb->common; return &acb->common;
} }
static void qcow_close(BlockDriverState *bs) static void qcow2_close(BlockDriverState *bs)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
qemu_free(s->l1_table); qemu_free(s->l1_table);
...@@ -721,7 +726,7 @@ static int qcow2_update_ext_header(BlockDriverState *bs, ...@@ -721,7 +726,7 @@ static int qcow2_update_ext_header(BlockDriverState *bs,
/* Prepare the backing file format extension if needed */ /* Prepare the backing file format extension if needed */
if (backing_fmt) { if (backing_fmt) {
ext_backing_fmt.len = cpu_to_be32(strlen(backing_fmt)); ext_backing_fmt.len = cpu_to_be32(strlen(backing_fmt));
ext_backing_fmt.magic = cpu_to_be32(QCOW_EXT_MAGIC_BACKING_FORMAT); ext_backing_fmt.magic = cpu_to_be32(QCOW2_EXT_MAGIC_BACKING_FORMAT);
backing_fmt_len = ((sizeof(ext_backing_fmt) backing_fmt_len = ((sizeof(ext_backing_fmt)
+ strlen(backing_fmt) + 7) & ~7); + strlen(backing_fmt) + 7) & ~7);
} }
...@@ -848,7 +853,7 @@ static int preallocate(BlockDriverState *bs) ...@@ -848,7 +853,7 @@ static int preallocate(BlockDriverState *bs)
return 0; return 0;
} }
static int qcow_create2(const char *filename, int64_t total_size, static int qcow2_create2(const char *filename, int64_t total_size,
const char *backing_file, const char *backing_format, const char *backing_file, const char *backing_format,
int flags, size_t cluster_size, int prealloc, int flags, size_t cluster_size, int prealloc,
QEMUOptionParameter *options) QEMUOptionParameter *options)
...@@ -974,7 +979,7 @@ out: ...@@ -974,7 +979,7 @@ out:
return ret; return ret;
} }
static int qcow_create(const char *filename, QEMUOptionParameter *options) static int qcow2_create(const char *filename, QEMUOptionParameter *options)
{ {
const char *backing_file = NULL; const char *backing_file = NULL;
const char *backing_fmt = NULL; const char *backing_fmt = NULL;
...@@ -1017,11 +1022,11 @@ static int qcow_create(const char *filename, QEMUOptionParameter *options) ...@@ -1017,11 +1022,11 @@ static int qcow_create(const char *filename, QEMUOptionParameter *options)
return -EINVAL; return -EINVAL;
} }
return qcow_create2(filename, sectors, backing_file, backing_fmt, flags, return qcow2_create2(filename, sectors, backing_file, backing_fmt, flags,
cluster_size, prealloc, options); cluster_size, prealloc, options);
} }
static int qcow_make_empty(BlockDriverState *bs) static int qcow2_make_empty(BlockDriverState *bs)
{ {
#if 0 #if 0
/* XXX: not correct */ /* XXX: not correct */
...@@ -1080,7 +1085,7 @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset) ...@@ -1080,7 +1085,7 @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset)
/* XXX: put compressed sectors first, then all the cluster aligned /* XXX: put compressed sectors first, then all the cluster aligned
tables to avoid losing bytes in alignment */ tables to avoid losing bytes in alignment */
static int qcow_write_compressed(BlockDriverState *bs, int64_t sector_num, static int qcow2_write_compressed(BlockDriverState *bs, int64_t sector_num,
const uint8_t *buf, int nb_sectors) const uint8_t *buf, int nb_sectors)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
...@@ -1148,32 +1153,33 @@ static int qcow_write_compressed(BlockDriverState *bs, int64_t sector_num, ...@@ -1148,32 +1153,33 @@ static int qcow_write_compressed(BlockDriverState *bs, int64_t sector_num,
return 0; return 0;
} }
static int qcow_flush(BlockDriverState *bs) static int qcow2_flush(BlockDriverState *bs)
{ {
return bdrv_flush(bs->file); return bdrv_flush(bs->file);
} }
static BlockDriverAIOCB *qcow_aio_flush(BlockDriverState *bs, static BlockDriverAIOCB *qcow2_aio_flush(BlockDriverState *bs,
BlockDriverCompletionFunc *cb, void *opaque) BlockDriverCompletionFunc *cb,
void *opaque)
{ {
return bdrv_aio_flush(bs->file, cb, opaque); return bdrv_aio_flush(bs->file, cb, opaque);
} }
static int64_t qcow_vm_state_offset(BDRVQcowState *s) static int64_t qcow2_vm_state_offset(BDRVQcowState *s)
{ {
return (int64_t)s->l1_vm_state_index << (s->cluster_bits + s->l2_bits); return (int64_t)s->l1_vm_state_index << (s->cluster_bits + s->l2_bits);
} }
static int qcow_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) static int qcow2_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
bdi->cluster_size = s->cluster_size; bdi->cluster_size = s->cluster_size;
bdi->vm_state_offset = qcow_vm_state_offset(s); bdi->vm_state_offset = qcow2_vm_state_offset(s);
return 0; return 0;
} }
static int qcow_check(BlockDriverState *bs, BdrvCheckResult *result) static int qcow2_check(BlockDriverState *bs, BdrvCheckResult *result)
{ {
return qcow2_check_refcounts(bs, result); return qcow2_check_refcounts(bs, result);
} }
...@@ -1199,7 +1205,7 @@ static void dump_refcounts(BlockDriverState *bs) ...@@ -1199,7 +1205,7 @@ static void dump_refcounts(BlockDriverState *bs)
} }
#endif #endif
static int qcow_save_vmstate(BlockDriverState *bs, const uint8_t *buf, static int qcow2_save_vmstate(BlockDriverState *bs, const uint8_t *buf,
int64_t pos, int size) int64_t pos, int size)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
...@@ -1208,13 +1214,13 @@ static int qcow_save_vmstate(BlockDriverState *bs, const uint8_t *buf, ...@@ -1208,13 +1214,13 @@ static int qcow_save_vmstate(BlockDriverState *bs, const uint8_t *buf,
BLKDBG_EVENT(bs->file, BLKDBG_VMSTATE_SAVE); BLKDBG_EVENT(bs->file, BLKDBG_VMSTATE_SAVE);
bs->growable = 1; bs->growable = 1;
ret = bdrv_pwrite(bs, qcow_vm_state_offset(s) + pos, buf, size); ret = bdrv_pwrite(bs, qcow2_vm_state_offset(s) + pos, buf, size);
bs->growable = growable; bs->growable = growable;
return ret; return ret;
} }
static int qcow_load_vmstate(BlockDriverState *bs, uint8_t *buf, static int qcow2_load_vmstate(BlockDriverState *bs, uint8_t *buf,
int64_t pos, int size) int64_t pos, int size)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
...@@ -1223,13 +1229,13 @@ static int qcow_load_vmstate(BlockDriverState *bs, uint8_t *buf, ...@@ -1223,13 +1229,13 @@ static int qcow_load_vmstate(BlockDriverState *bs, uint8_t *buf,
BLKDBG_EVENT(bs->file, BLKDBG_VMSTATE_LOAD); BLKDBG_EVENT(bs->file, BLKDBG_VMSTATE_LOAD);
bs->growable = 1; bs->growable = 1;
ret = bdrv_pread(bs, qcow_vm_state_offset(s) + pos, buf, size); ret = bdrv_pread(bs, qcow2_vm_state_offset(s) + pos, buf, size);
bs->growable = growable; bs->growable = growable;
return ret; return ret;
} }
static QEMUOptionParameter qcow_create_options[] = { static QEMUOptionParameter qcow2_create_options[] = {
{ {
.name = BLOCK_OPT_SIZE, .name = BLOCK_OPT_SIZE,
.type = OPT_SIZE, .type = OPT_SIZE,
...@@ -1266,36 +1272,36 @@ static QEMUOptionParameter qcow_create_options[] = { ...@@ -1266,36 +1272,36 @@ static QEMUOptionParameter qcow_create_options[] = {
static BlockDriver bdrv_qcow2 = { static BlockDriver bdrv_qcow2 = {
.format_name = "qcow2", .format_name = "qcow2",
.instance_size = sizeof(BDRVQcowState), .instance_size = sizeof(BDRVQcowState),
.bdrv_probe = qcow_probe, .bdrv_probe = qcow2_probe,
.bdrv_open = qcow_open, .bdrv_open = qcow2_open,
.bdrv_close = qcow_close, .bdrv_close = qcow2_close,
.bdrv_create = qcow_create, .bdrv_create = qcow2_create,
.bdrv_flush = qcow_flush, .bdrv_flush = qcow2_flush,
.bdrv_is_allocated = qcow_is_allocated, .bdrv_is_allocated = qcow2_is_allocated,
.bdrv_set_key = qcow_set_key, .bdrv_set_key = qcow2_set_key,
.bdrv_make_empty = qcow_make_empty, .bdrv_make_empty = qcow2_make_empty,
.bdrv_aio_readv = qcow_aio_readv, .bdrv_aio_readv = qcow2_aio_readv,
.bdrv_aio_writev = qcow_aio_writev, .bdrv_aio_writev = qcow2_aio_writev,
.bdrv_aio_flush = qcow_aio_flush, .bdrv_aio_flush = qcow2_aio_flush,
.bdrv_truncate = qcow2_truncate, .bdrv_truncate = qcow2_truncate,
.bdrv_write_compressed = qcow_write_compressed, .bdrv_write_compressed = qcow2_write_compressed,
.bdrv_snapshot_create = qcow2_snapshot_create, .bdrv_snapshot_create = qcow2_snapshot_create,
.bdrv_snapshot_goto = qcow2_snapshot_goto, .bdrv_snapshot_goto = qcow2_snapshot_goto,
.bdrv_snapshot_delete = qcow2_snapshot_delete, .bdrv_snapshot_delete = qcow2_snapshot_delete,
.bdrv_snapshot_list = qcow2_snapshot_list, .bdrv_snapshot_list = qcow2_snapshot_list,
.bdrv_snapshot_load_tmp = qcow2_snapshot_load_tmp, .bdrv_snapshot_load_tmp = qcow2_snapshot_load_tmp,
.bdrv_get_info = qcow_get_info, .bdrv_get_info = qcow2_get_info,
.bdrv_save_vmstate = qcow_save_vmstate, .bdrv_save_vmstate = qcow2_save_vmstate,
.bdrv_load_vmstate = qcow_load_vmstate, .bdrv_load_vmstate = qcow2_load_vmstate,
.bdrv_change_backing_file = qcow2_change_backing_file, .bdrv_change_backing_file = qcow2_change_backing_file,
.create_options = qcow_create_options, .create_options = qcow2_create_options,
.bdrv_check = qcow_check, .bdrv_check = qcow2_check,
}; };
static void bdrv_qcow2_init(void) static void bdrv_qcow2_init(void)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或