Merge tag 'v1.1.1' into stable-1.1qemu-kvm-1.1.1

* tag 'v1.1.1': (34 commits)
  update VERSION for v1.1.1
  s390x: fix s390 virtio aliases
  rtl8139: validate rx ring before receiving packets
  ahci: SATA FIS is 20 bytes, not 0x20
  qemu-img: document qed format on qemu-img man page
  virtio: Fix compiler warning for non Linux hosts
  sheepdog: fix return value of do_load_save_vm_state
  qemu/xendisk: set maximum number of grants to be used
  build: install qmp-commands.txt
  fdc: fix implied seek while there is no media in drive
  qcow2: fix autoclear image header update
  Prevent disk data loss when closing qemu
  qcow2: fix endianness conversion
  pci_bridge_dev: fix error path in pci_bridge_dev_initfn()
  qdev: release parent properties on dc->init failure
  intel-hda: Fix reset of MSI function
  ahci: Fix reset of MSI function
  rtl8139: honor RxOverflow flag in can_receive method
  configure: Fix build for some versions of glibc (9pfs)
  monitor: Fix memory leak with readline completion
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 9 insertions, 8 deletions

diff --git a/block/qcow2.c b/block/qcow2.c
index c2e49cded..79201fce2 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);