commit 015f7dadccde2869981bf24990cb630066663825 Author: Lee Yarwood Date: Wed Aug 19 17:20:46 2020 +0100 libvirt: Remove MIN_{LIBVIRT,QEMU}_PMEM_SUPPORT I8e349849db0b1a540d295c903f1470917b82fd97 has bumped MIN_{LIBVIRT,QEMU}_VERSION past this so remove the constant and associated logic. Change-Id: Ibe0af519b4428ef05f83248679fe66382d20cfa8 diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index e0d269c..f1d16ce 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -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