[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH stable-1.1 24/26] qcow2: fix autoclear image header
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH stable-1.1 24/26] qcow2: fix autoclear image header update |
Date: |
Fri, 22 Jun 2012 19:33:28 -0500 |
From: Stefan Hajnoczi <address@hidden>
The autoclear feature bits can be used for qcow2 file format features
that are safe to "drop" by old programs that do not understand the
feature. Upon opening the image file unknown autoclear feature bits are
cleared and the image file header is rewritten, but this was happening
too early in the code when critical header fields were not yet loaded.
Process autoclear feature bits after all necessary header information
has been loaded.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index c2e49cd..79201fc 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -298,14 +298,6 @@ static int qcow2_open(BlockDriverState *bs, int flags)
goto fail;
}
- if (!bs->read_only && s->autoclear_features != 0) {
- s->autoclear_features = 0;
- ret = qcow2_update_header(bs);
- if (ret < 0) {
- goto fail;
- }
- }
-
/* Check support for various header values */
if (header.refcount_order != 4) {
report_unsupported(bs, "%d bit reference counts",
@@ -411,6 +403,15 @@ static int qcow2_open(BlockDriverState *bs, int flags)
goto fail;
}
+ /* Clear unknown autoclear feature bits */
+ if (!bs->read_only && s->autoclear_features != 0) {
+ s->autoclear_features = 0;
+ ret = qcow2_update_header(bs);
+ if (ret < 0) {
+ goto fail;
+ }
+ }
+
/* Initialise locks */
qemu_co_mutex_init(&s->lock);
--
1.7.4.1
- [Qemu-devel] [PATCH stable-1.1 12/26] kvm/apic: correct short memset, (continued)
- [Qemu-devel] [PATCH stable-1.1 12/26] kvm/apic: correct short memset, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 13/26] kvm: i8254: Fix conversion of in-kernel to userspace state, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 14/26] qcow2: Silence false warning, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 15/26] monitor: Fix memory leak with readline completion, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 16/26] configure: Fix build for some versions of glibc (9pfs), Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 17/26] rtl8139: honor RxOverflow flag in can_receive method, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 18/26] ahci: Fix reset of MSI function, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 21/26] pci_bridge_dev: fix error path in pci_bridge_dev_initfn(), Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 22/26] qcow2: fix endianness conversion, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 23/26] Prevent disk data loss when closing qemu, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 24/26] qcow2: fix autoclear image header update,
Michael Roth <=
- [Qemu-devel] [PATCH stable-1.1 20/26] qdev: release parent properties on dc->init failure, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 25/26] fdc: fix implied seek while there is no media in drive, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 19/26] intel-hda: Fix reset of MSI function, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 26/26] build: install qmp-commands.txt, Michael Roth, 2012/06/22
- Re: [Qemu-devel] [PATCH stable-1.1 00/26] Initial tree and candidates for stable-1.1, Stefano Stabellini, 2012/06/25
- Re: [Qemu-devel] [PATCH stable-1.1 00/26] Initial tree and candidates for stable-1.1, Kevin Wolf, 2012/06/25