Message ID | CAJSP0QVgHQdjLzUs3Z8MxNaAP3s2UwyBcmU6Nf5EdDdrb0LEoA@mail.gmail.com |
---|---|
State | New |
Headers | show |
Am 02.09.2013 um 15:52 hat Stefan Hajnoczi geschrieben: > On Mon, Sep 2, 2013 at 10:49 AM, Kevin Wolf <kwolf@redhat.com> wrote: > > From: Max Reitz <mreitz@redhat.com> > > > > Move the OFLAG_COPIED checks out of check_refcounts_l1 and > > check_refcounts_l2 and after the actual refcount checks/fixes (since the > > refcounts might actually change there). > > > > Signed-off-by: Max Reitz <mreitz@redhat.com> > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > > --- > > block/qcow2-refcount.c | 115 +++++++++++++++++++++++++++++++++++-------------- > > 1 file changed, 82 insertions(+), 33 deletions(-) > > This patch breaks qemu-iotests 039 as follows: Anthony, please pull anyway. This is just a missing update to the reference output of the test case when run with cache=writethrough. Max sent a follow-up that Stefan will include in the next pull request. Kevin
--- 039.out 2013-09-02 13:31:26.134178859 +0200 +++ 039.out.bad 2013-09-02 15:48:00.103063126 +0200 @@ -12,8 +12,8 @@ wrote 512/512 bytes at offset 0 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) incompatible_features 0x1 -ERROR OFLAG_COPIED: offset=8000000000050000 refcount=0 ERROR cluster 5 refcount=0 reference=1 +ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0 2 errors were found on the image. Data may be corrupted, or further writes to the image may corrupt it. @@ -24,7 +24,6 @@ incompatible_features 0x1 == Repairing the image file must succeed == -ERROR OFLAG_COPIED: offset=8000000000050000 refcount=0 Repairing cluster 5 refcount=0 reference=1 The following inconsistencies were found and repaired: @@ -44,7 +43,6 @@ wrote 512/512 bytes at offset 0 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) incompatible_features 0x1 -ERROR OFLAG_COPIED: offset=8000000000050000 refcount=0 Repairing cluster 5 refcount=0 reference=1 wrote 512/512 bytes at offset 0 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)