From 27ca9210bf4f29c7e0c0f2988899b75b4a522532 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Sun, 24 Jul 2011 12:02:34 +0300 Subject: [PATCH] kvm tools: Rename 'struct qcow_table' to 'struct qcow_l1_table' This patch renames the ambiguous 'struct qcow_table' to 'struct qcow_l1_table' in preparation for introducing 'struct qcow_refcount_table'. Signed-off-by: Pekka Enberg --- tools/kvm/disk/qcow.c | 8 ++++---- tools/kvm/include/kvm/qcow.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/kvm/disk/qcow.c b/tools/kvm/disk/qcow.c index bffd4b63401a..7ee4af10c2eb 100644 --- a/tools/kvm/disk/qcow.c +++ b/tools/kvm/disk/qcow.c @@ -234,7 +234,7 @@ error: static ssize_t qcow_read_cluster(struct qcow *q, u64 offset, void *dst, u32 dst_len) { struct qcow_header *header = q->header; - struct qcow_table *table = &q->table; + struct qcow_l1_table *table = &q->table; struct qcow_l2_table *l2_table; u64 l2_table_offset; u64 l2_table_size; @@ -393,7 +393,7 @@ static u64 qcow_write_l2_table(struct qcow *q, u64 *table) static ssize_t qcow_write_cluster(struct qcow *q, u64 offset, void *buf, u32 src_len) { struct qcow_header *header = q->header; - struct qcow_table *table = &q->table; + struct qcow_l1_table *table = &q->table; struct qcow_l2_table *l2t; u64 clust_start; u64 clust_off; @@ -547,7 +547,7 @@ static int qcow_disk_flush(struct disk_image *disk) struct qcow *q = disk->priv; struct qcow_header *header; struct list_head *pos, *n; - struct qcow_table *table; + struct qcow_l1_table *table; header = q->header; table = &q->table; @@ -609,7 +609,7 @@ static struct disk_image_operations qcow_disk_ops = { static int qcow_read_l1_table(struct qcow *q) { struct qcow_header *header = q->header; - struct qcow_table *table = &q->table; + struct qcow_l1_table *table = &q->table; table->table_size = header->l1_size; diff --git a/tools/kvm/include/kvm/qcow.h b/tools/kvm/include/kvm/qcow.h index ec9c77db4325..7e06e1095e69 100644 --- a/tools/kvm/include/kvm/qcow.h +++ b/tools/kvm/include/kvm/qcow.h @@ -30,7 +30,7 @@ struct qcow_l2_table { u64 table[]; }; -struct qcow_table { +struct qcow_l1_table { u32 table_size; u64 *l1_table; }; @@ -38,7 +38,7 @@ struct qcow_table { struct qcow { pthread_mutex_t mutex; void *header; - struct qcow_table table; + struct qcow_l1_table table; int fd; /* Level2 caching data structures */ -- 2.39.5