Nir Soffer has submitted this change and it was merged. Change subject: qemuimg.py: Don't check compat support ......................................................................
qemuimg.py: Don't check compat support Modern qemu-img versions allow different QCOW2 formats - 0.10 and 1.1, although we force the use of 0.10 by default in order to be backwards compatible with old hupervisors that may still need to connect to a V3 domain. Sufficiently old qemu-img versions, though, don't even support the compat argument, requiring VDSM to query its existence with the "-o ?" flag before deciding whether to use it. As EL6 support was dropped and VDSM requires qemu-img>=2.3.0, this check is now redundant, and can safely be removed, thus cleaning up the code, and saving some CPU cycles. As part of this patch, the tests were also cleaned up to match the code. Tests for qemu-img that does not support the compat argument were removed, and the remaining tests were renamed to better remove the notion that having this argument is something special. Change-Id: Ie141ac33f60b340b7f12832e4fb6b92ea6a68289 Signed-off-by: Allon Mureinik <amure...@redhat.com> Reviewed-on: https://gerrit.ovirt.org/55925 Continuous-Integration: Jenkins CI Reviewed-by: Nir Soffer <nsof...@redhat.com> Reviewed-by: Adam Litke <ali...@redhat.com> --- M lib/vdsm/qemuimg.py M tests/qemuimgTests.py 2 files changed, 11 insertions(+), 106 deletions(-) Approvals: Adam Litke: Looks good to me, approved Nir Soffer: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/55925 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie141ac33f60b340b7f12832e4fb6b92ea6a68289 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amure...@redhat.com> Gerrit-Reviewer: Adam Litke <ali...@redhat.com> Gerrit-Reviewer: Allon Mureinik <amure...@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsof...@redhat.com> Gerrit-Reviewer: gerrit-hooks <automat...@ovirt.org> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org