diff options
| author | Stephen Finucane <sfinucan@redhat.com> | 2020-02-27 11:47:41 +0000 |
|---|---|---|
| committer | Stephen Finucane <stephenfin@redhat.com> | 2020-04-01 15:29:02 +0100 |
| commit | bd9bea5690e14b252bd13921268bf2e976351c2e (patch) | |
| tree | 2fa0610ba16c70cf1f1ca2ed3b0429ce2c4804f7 /nova/virt/images.py | |
| parent | dce9bc03c4753b8acd5ce722c1adcfee7540af0e (diff) | |
| download | nova-bd9bea5690e14b252bd13921268bf2e976351c2e.tar.gz | |
libvirt: Remove QEMU_VERSION_REQ_SHARED
The updated minimum required libvirt (4.0.0) and QEMU (2.11)
for "Ussuri" satisfy the version requirements; this was done
in Change-Id: Ia18e9be4d (22c1916b49 — libvirt: Bump
MIN_{LIBVIRT,QEMU}_VERSION for "Ussuri", 2019-11-19).
Drop the version constant QEMU_VERSION_REQ_SHARED and now-needless
compatibility code; adjust/remove tests.
Change-Id: If878a023c69f25a9ea45b7de2ff9eb1976aaeb8c
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
Diffstat (limited to 'nova/virt/images.py')
| -rw-r--r-- | nova/virt/images.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/nova/virt/images.py b/nova/virt/images.py index 54db59df5c..800ebca3c7 100644 --- a/nova/virt/images.py +++ b/nova/virt/images.py @@ -33,10 +33,6 @@ from nova.i18n import _ from nova.image import glance import nova.privsep.qemu -# This is set by the libvirt driver on startup. The version is used to -# determine what flags need to be set on the command line. -QEMU_VERSION = None - LOG = logging.getLogger(__name__) CONF = nova.conf.CONF @@ -49,8 +45,7 @@ def qemu_img_info(path, format=None, output_format=None): raise exception.DiskNotFound(location=path) info = nova.privsep.qemu.unprivileged_qemu_img_info( - path, format=format, qemu_version=QEMU_VERSION, - output_format=output_format) + path, format=format, output_format=output_format) if output_format: return imageutils.QemuImgInfo(info, format=output_format) else: @@ -63,8 +58,7 @@ def privileged_qemu_img_info(path, format=None, output_format=None): raise exception.DiskNotFound(location=path) info = nova.privsep.qemu.privileged_qemu_img_info( - path, format=format, qemu_version=QEMU_VERSION, - output_format=output_format) + path, format=format, output_format=output_format) if output_format: return imageutils.QemuImgInfo(info, format=output_format) else: |