Comment 3 for bug 1558697

Reviewed: https://review.openstack.org/294205
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=a0b86d806ee10bead7da7b0987362d9b6e31889e
Submitter: Jenkins
Branch: stable/kilo

commit a0b86d806ee10bead7da7b0987362d9b6e31889e
Author: Lee Yarwood <email address hidden>
Date: Thu Mar 17 16:36:08 2016 +0000

    libvirt: Decode disk_info before use

    The fix for OSSA 2016-007 / CVE-2016-2140 in f302bf04 assumed that
    disk_info is always a plain, decoded list. However prior to Liberty
    when preforming a live block migration the compute manager populates
    disk_info with an encoded JSON string when calling
    self.driver.get_instance_disk_info. In the live migration case without
    block migration disk_info is None.

    As a result we should always decode disk_info when a block migration
    is called for to ensure that we can iterate over the disks and rebuild
    the disk.info file.

    The following change removed the JSON encoding from
    get_instance_disk_info and other methods within the libvirt driver for
    Liberty.

    libvirt: Remove unnecessary JSON conversions
    https://review.openstack.org/#/c/177437/6

    Closes-Bug: #1558697
    Change-Id: Icfe1f23cc3af2d0166dac82109111e341623fc4a