From e11fb759a4c9057e8d081f730118196462f2289f Mon Sep 17 00:00:00 2001 From: FFrog Date: Thu, 9 Sep 2021 19:53:21 +0800 Subject: [PATCH] fix the bugs about downgrading the version of qemu from 4.2.0 to 4.1.0 (cherry picked from commit 93f7fd36744724298526b4864e21e6976283bdc5) --- ...-version-of-qemu-from-4.2.0-to-4.1.0.patch | 23 ++++++++++++++----- openstack-nova.spec | 5 +++- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/0001-downgrade-the-version-of-qemu-from-4.2.0-to-4.1.0.patch b/0001-downgrade-the-version-of-qemu-from-4.2.0-to-4.1.0.patch index 465d541..62e4dec 100644 --- a/0001-downgrade-the-version-of-qemu-from-4.2.0-to-4.1.0.patch +++ b/0001-downgrade-the-version-of-qemu-from-4.2.0-to-4.1.0.patch @@ -1,14 +1,14 @@ -From f399e11607bbd74cc39760ead9c29122f22c2b6a Mon Sep 17 00:00:00 2001 +From 61fdc7d0caa978864e196a48d06ff262f7c78dc9 Mon Sep 17 00:00:00 2001 From: FFrog -Date: Tue, 7 Sep 2021 15:44:00 +0800 +Date: Thu, 9 Sep 2021 19:35:41 +0800 Subject: [PATCH] downgrade the version of qemu from 4.2.0 to 4.1.0 --- - nova/virt/libvirt/driver.py | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) + nova/virt/libvirt/driver.py | 24 ++++++++++++++++++++++-- + 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py -index 8ee8757..865ecb7 100644 +index 8ee8757..e447b85 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -213,7 +213,7 @@ patch_tpool_proxy() @@ -20,7 +20,18 @@ index 8ee8757..865ecb7 100644 NEXT_MIN_LIBVIRT_VERSION = (7, 0, 0) NEXT_MIN_QEMU_VERSION = (5, 2, 0) -@@ -2092,7 +2092,23 @@ class LibvirtDriver(driver.ComputeDriver): +@@ -234,6 +234,10 @@ VGPU_RESOURCE_SEMAPHORE = 'vgpu_resources' + + LIBVIRT_PERF_EVENT_PREFIX = 'VIR_PERF_PARAM_' + ++# -blockdev support (replacing -drive) ++MIN_LIBVIRT_BLOCKDEV = (6, 0, 0) ++MIN_QEMU_BLOCKDEV = (4, 2, 0) ++ + # VDPA interface support + MIN_LIBVIRT_VDPA = (6, 9, 0) + MIN_QEMU_VDPA = (5, 1, 0) +@@ -2092,7 +2096,23 @@ class LibvirtDriver(driver.ComputeDriver): guest.delete_configuration(support_uefi) try: diff --git a/openstack-nova.spec b/openstack-nova.spec index cfbac97..f922747 100644 --- a/openstack-nova.spec +++ b/openstack-nova.spec @@ -17,7 +17,7 @@ Name: openstack-nova # Liberty semver reset # https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z Version: 23.0.1 -Release: 4 +Release: 5 Summary: OpenStack Compute (nova) License: ASL 2.0 @@ -729,6 +729,9 @@ exit 0 %endif %changelog +* Thu Sep 09 2021 ffrog - 23.0.1-5 +- Fix the bugs about downgrading the version requirement of qemu from 4.2.0 to 4.1.0 + * Tue Sep 07 2021 ffrog - 23.0.1-4 - Downgrade the version requirement of qemu from 4.2.0 to 4.1.0 -- Gitee