[Qemu-commits] [qemu/qemu] 605bc8: qcow2: try load bitmaps only once

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 605bc8be4260d3440fdfd0079005e6d9c6fc1e44
      
https://github.com/qemu/qemu/commit/605bc8be4260d3440fdfd0079005e6d9c6fc1e44
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M block/qcow2.c
    M block/qcow2.h

  Log Message:
  -----------
  qcow2: try load bitmaps only once

Checking reopen by existence of some bitmaps is wrong, as it may be
some other bitmaps, or on the other hand, user may remove bitmaps. This
criteria is bad. To simplify things and make behavior more predictable
let's just add a flag to remember, that we've already tried to load
bitmaps on open and do not want do it again.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-id: address@hidden
[mreitz: Changed comment wording according to Eric Blake's suggestion]
Signed-off-by: Max Reitz <address@hidden>


  Commit: 25bf2426f3b27857afa35194227040eab821a047
      
https://github.com/qemu/qemu/commit/25bf2426f3b27857afa35194227040eab821a047
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M tests/qemu-iotests/169

  Log Message:
  -----------
  iotests: fix 169

Improve and fix 169:
    - use MIGRATION events instead of RESUME
    - make a TODO: enable dirty-bitmaps capability for offline case
    - recreate vm_b without -incoming near test end

This (likely) fixes racy faults at least of the following types:

    - timeout on waiting for RESUME event
    - sha256 mismatch on line 136 (142 after this patch)
    - fail to self.vm_b.launch() on line 135 (141 now after this patch)

And surely fixes cat processes, left after test finish.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-id: address@hidden
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 042f6a31af3d38eefc6ec995cce1d762c41d4515
      
https://github.com/qemu/qemu/commit/042f6a31af3d38eefc6ec995cce1d762c41d4515
  Author: Peter Maydell <address@hidden>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M block/qcow2.c
    M block/qcow2.h
    M tests/qemu-iotests/169

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2018-04-16' 
into staging

A fix for handling dirty bitmaps stored in qcow2 files.  This is not
absolutely necessary for 2.12, but if there is an rc4, it should go in.

# gpg: Signature made Mon 16 Apr 2018 13:35:08 BST
# gpg:                using RSA key F407DB0061D5CF40
# gpg: Good signature from "Max Reitz <address@hidden>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/maxreitz/tags/pull-block-2018-04-16:
  iotests: fix 169
  qcow2: try load bitmaps only once

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/aac8f55633f4...042f6a31af3d