Description of problem:

Beyond the removal of the x- debug prefix, there are several API changes being worked on  upstream that should be backported to qemu-kvm-rhev under RHEL7:

1. The addition of the "persistent" bit exposed via query-block
2/3. The addition of the "busy" and "recording" bits exposed via query-block, which replace the @status enum
4. The addition of the "inconsistent" or "corrupted" bit for bitmaps which allows the removal/resetting of bitmaps involved in a crash incident
5. QAPI documentation fixes and cleanups for 4.0

The corresponding features work as follows:

#1: Any bitmap set to be persistent should report via query-block that it is persistent, so users gain the ability to check that bitmaps will eventually be written out to disk on close (they do not get written out immediately, currently.)

#2: The "busy" bit replaces the status=FROZEN and status=LOCKED statuses. It should be set when the bitmap is being used for a backup operation OR when it is being used for an NBD export operation. Locked bitmaps cannot be used for any QMP operations, including: clear, remove, merge, enable, disable, blockdev-backup, drive-backup, or NBD exports.

#3: The "recording" bit generally replaces status=ACTIVE but it can be true concurrently with busy=true. recording means that the bitmap is enabled, and it should be true after block-dirty-bitmap-enable and it should be false after block-dirty-bitmap-disable.

#4: The inconsistent bit is set when a persistent bitmap is not properly written back to qcow2 file. Upon re-loading QEMU, this bitmap should have inconsistent=true and cannot be used for most QMP operations, including: merge, enable, disable, blockdev-backup, drive-backup, or NBD exports. The bitmap should appear as recording=false and busy=false.

Inconsistent bitmaps can be deleted with block_dirty_bitmap_remove, which should also delete it from the qcow2 file.

Inconsistent bitmaps can be cleared with block_dirty_bitmap_clear, which should set inconsistent=false but obviously the bitmap data is lost.

This can be tested by creating a dirty bitmap and simulating an unclean shutdown by using kill -9.

#5: No functional tests needed to verify.