Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > 340e01248478ba8b78a6d4d1809b1eff > files > 210

kvm-83-270.el5_11.src.rpm

From c0bbe910f00867696602b6c08ce445e61ef68faf Mon Sep 17 00:00:00 2001
From: Uri Lublin <uril@redhat.com>
Date: Mon, 30 Mar 2009 23:15:46 +0300
Subject: [PATCH 05/12] Revert "block-qcow2: export highest_allocated through BlockDriverInfo and get_info() (Uri Lublin)"

This reverts commit 35d2a27fe47c87ecf2b6d3eac1d05ade35ff308c.

Was not accepted upstream. Using an alternative solution with
watermark and asynchronous notification.

Signed-off-by: Uri Lublin <uril@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Bugzilla: 489964
RH-Upstream-status: not-applicable
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: Dor Laor <dlaor@redhat.com>
---
 qemu/block-qcow2.c |    1 -
 qemu/block.h       |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/qemu/block-qcow2.c b/qemu/block-qcow2.c
index 9175c9d..2431018 100644
--- a/qemu/block-qcow2.c
+++ b/qemu/block-qcow2.c
@@ -1682,7 +1682,6 @@ static int qcow_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
     bdi->cluster_size = s->cluster_size;
     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;
     return 0;
 }
 
diff --git a/qemu/block.h b/qemu/block.h
index 403065b..5c09113 100644
--- a/qemu/block.h
+++ b/qemu/block.h
@@ -25,7 +25,6 @@ typedef struct BlockDriverInfo {
     int cluster_size;
     /* 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) */
 } BlockDriverInfo;
 
 typedef struct QEMUSnapshotInfo {
-- 
1.6.1