[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6818] Revert r6407
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [6818] Revert r6407 |
Date: |
Wed, 11 Mar 2009 20:16:01 +0000 |
Revision: 6818
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6818
Author: aliguori
Date: 2009-03-11 20:16:01 +0000 (Wed, 11 Mar 2009)
Log Message:
-----------
Revert r6407
This series is broken by design as it requires expensive IO operations at
open time causing very long delays when starting a virtual machine for the
first time.
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
branches/stable_0_10_0/block-qcow2.c
branches/stable_0_10_0/block.c
branches/stable_0_10_0/block.h
Modified: branches/stable_0_10_0/block-qcow2.c
===================================================================
--- branches/stable_0_10_0/block-qcow2.c 2009-03-11 20:15:55 UTC (rev
6817)
+++ branches/stable_0_10_0/block-qcow2.c 2009-03-11 20:16:01 UTC (rev
6818)
@@ -145,7 +145,6 @@
AES_KEY aes_decrypt_key;
int64_t highest_alloc; /* highest cluester allocated (in clusters) */
- int64_t nc_free; /* num of free clusters below highest_alloc */
uint64_t snapshots_offset;
int snapshots_size;
@@ -174,7 +173,7 @@
#ifdef DEBUG_ALLOC
static void check_refcounts(BlockDriverState *bs);
#endif
-static void scan_refcount(BlockDriverState *bs, int64_t *high, int64_t *free);
+static void scan_refcount(BlockDriverState *bs, int64_t *high);
static int qcow_probe(const uint8_t *buf, int buf_size, const char *filename)
@@ -276,7 +275,7 @@
if (refcount_init(bs) < 0)
goto fail;
- scan_refcount(bs, &s->highest_alloc, &s->nc_free);
+ scan_refcount(bs, &s->highest_alloc);
/* read the backing file name */
if (header.backing_file_offset != 0) {
@@ -1647,7 +1646,6 @@
bdi->vm_state_offset = (int64_t)s->l1_vm_state_index <<
(s->cluster_bits + s->l2_bits);
bdi->highest_alloc = s->highest_alloc << s->cluster_bits;
- bdi->num_free_bytes = s->nc_free << s->cluster_bits;
return 0;
}
@@ -2166,35 +2164,25 @@
return 0;
}
-static void scan_refcount(BlockDriverState *bs, int64_t *high, int64_t *free)
+static void scan_refcount(BlockDriverState *bs, int64_t *high)
{
BDRVQcowState *s = bs->opaque;
- int64_t refcnt_index, cluster_index, cluster_end, h = 0, f = 0;
- int64_t tail = 0; /* do not count last consecutive free entries */
+ int64_t refcnt_index, cluster_index, cluster_end, h = 0;
for (refcnt_index=0; refcnt_index < s->refcount_table_size;
refcnt_index++){
if (s->refcount_table[refcnt_index] == 0) {
- f += 1 << (s->cluster_bits - REFCOUNT_SHIFT);
- tail += 1 << (s->cluster_bits - REFCOUNT_SHIFT);
continue;
}
cluster_index = refcnt_index << (s->cluster_bits - REFCOUNT_SHIFT);
cluster_end = (refcnt_index + 1) << (s->cluster_bits - REFCOUNT_SHIFT);
for ( ; cluster_index < cluster_end; cluster_index++) {
- if (get_refcount(bs, cluster_index) == 0) {
- f++;
- tail++;
- }
- else {
+ if (get_refcount(bs, cluster_index) == 0)
+ /* do nothing -- reserved for free counting */;
+ else
h = cluster_index;
- tail = 0;
- }
}
}
- f -= tail;
- if (free)
- *free = f;
if (high)
*high = (h+1);
}
@@ -2240,10 +2228,8 @@
(s->free_cluster_index - nb_clusters) << s->cluster_bits);
#endif
- if (s->highest_alloc < s->free_cluster_index) {
- s->nc_free += (s->free_cluster_index - s->highest_alloc);
+ if (s->highest_alloc < s->free_cluster_index)
s->highest_alloc = s->free_cluster_index;
- }
return (s->free_cluster_index - nb_clusters) << s->cluster_bits;
}
@@ -2418,12 +2404,6 @@
block_index = cluster_index &
((1 << (s->cluster_bits - REFCOUNT_SHIFT)) - 1);
refcount = be16_to_cpu(s->refcount_block_cache[block_index]);
-
- if (refcount == 1 && addend == -1)
- s->nc_free += 1;
- else if (refcount == 0 && addend == 1)
- s->nc_free -= 1;
-
refcount += addend;
if (refcount < 0 || refcount > 0xffff)
return -EINVAL;
Modified: branches/stable_0_10_0/block.c
===================================================================
--- branches/stable_0_10_0/block.c 2009-03-11 20:15:55 UTC (rev 6817)
+++ branches/stable_0_10_0/block.c 2009-03-11 20:16:01 UTC (rev 6818)
@@ -1138,9 +1138,8 @@
bs->rd_bytes, bs->wr_bytes,
bs->rd_ops, bs->wr_ops);
if (bdrv_get_info(bs, &bdi) == 0)
- term_printf(" high=%" PRId64
- " bytes_free=%" PRId64,
- bdi.highest_alloc, bdi.num_free_bytes);
+ term_printf(" high=%" PRId64,
+ bdi.highest_alloc);
term_printf("\n");
}
}
Modified: branches/stable_0_10_0/block.h
===================================================================
--- branches/stable_0_10_0/block.h 2009-03-11 20:15:55 UTC (rev 6817)
+++ branches/stable_0_10_0/block.h 2009-03-11 20:16:01 UTC (rev 6818)
@@ -27,7 +27,6 @@
/* offset at which the VM state can be saved (0 if not possible) */
int64_t vm_state_offset;
int64_t highest_alloc; /* highest allocated block offset (in bytes) */
- int64_t num_free_bytes; /* below highest_alloc */
} BlockDriverInfo;
typedef struct QEMUSnapshotInfo {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6818] Revert r6407,
Anthony Liguori <=