openstack
/
nova
Code Issues Proposed changes

Merge "libvirt: Remove MIN_{LIBVIRT,QEMU}_PMEM_SUPPORT"

This commit is contained in:
Zuul 2020-10-05 14:08:13 +00:00 committed by Gerrit Code Review
parent 8bb44fd545 015f7dadcc
commit 43801cf24a
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nova/virt/libvirt/driver.py
View File

@ -249,10 +249,6 @@ VGPU_RESOURCE_SEMAPHORE = 'vgpu_resources'
LIBVIRT_PERF_EVENT_PREFIX = 'VIR_PERF_PARAM_'
# Persistent Memory (PMEM/NVDIMM) Device Support
MIN_LIBVIRT_PMEM_SUPPORT = (5, 0, 0)
MIN_QEMU_PMEM_SUPPORT = (3, 1, 0)
# -blockdev support (replacing -drive)
MIN_LIBVIRT_BLOCKDEV = (6, 0, 0)
MIN_QEMU_BLOCKDEV = (4, 2, 0)
@ -413,17 +409,6 @@ class LibvirtDriver(driver.ComputeDriver):
if not vpmem_conf:
return {}, {}
if not self._host.has_min_version(lv_ver=MIN_LIBVIRT_PMEM_SUPPORT,
hv_ver=MIN_QEMU_PMEM_SUPPORT):
raise exception.InvalidConfiguration(
_('Nova requires QEMU version %(qemu)s or greater '
'and Libvirt version %(libvirt)s or greater '
'for NVDIMM (Persistent Memory) support.') % {
'qemu': libvirt_utils.version_to_string(
MIN_QEMU_PMEM_SUPPORT),
'libvirt': libvirt_utils.version_to_string(
MIN_LIBVIRT_PMEM_SUPPORT)})
# vpmem keyed by name {name: objects.LibvirtVPMEMDevice,...}
vpmems_by_name: ty.Dict[str, 'objects.LibvirtVPMEMDevice'] = {}
# vpmem list keyed by resource class