packages/openstack-nova
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!25 fix the bugs about downgrading the version of qemu from 4.2.0 to 4.1.0

Browse Source 
From: @ffrog
Reviewed-by: @huangtianhua
Signed-off-by: @huangtianhua
This commit is contained in:
openeuler-ci-bot 2021-09-09 12:13:05 +00:00 committed by Gitee
commit 9c9a2a6d16
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
0001-downgrade-the-version-of-qemu-from-4.2.0-to-4.1.0.patch
View File

@ -1,14 +1,14 @@
From f399e11607bbd74cc39760ead9c29122f22c2b6a Mon Sep 17 00:00:00 2001 From 61fdc7d0caa978864e196a48d06ff262f7c78dc9 Mon Sep 17 00:00:00 2001
From: FFrog <ljw1101.vip@gmail.com> From: FFrog <ljw1101.vip@gmail.com>
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 Subject: [PATCH] downgrade the version of qemu from 4.2.0 to 4.1.0
--- ---
nova/virt/libvirt/driver.py | 20 ++++++++++++++++++-- nova/virt/libvirt/driver.py | 24 ++++++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-) 1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py 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 --- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py
@@ -213,7 +213,7 @@ patch_tpool_proxy() @@ -213,7 +213,7 @@ patch_tpool_proxy()
@ -20,7 +20,18 @@ index 8ee8757..865ecb7 100644
NEXT_MIN_LIBVIRT_VERSION = (7, 0, 0) NEXT_MIN_LIBVIRT_VERSION = (7, 0, 0)
NEXT_MIN_QEMU_VERSION = (5, 2, 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) guest.delete_configuration(support_uefi)
try: try:

5
openstack-nova.spec
View File

@ -17,7 +17,7 @@ Name: openstack-nova
# Liberty semver reset # Liberty semver reset
# https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z # https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z
Version: 23.0.1 Version: 23.0.1
Release: 4 Release: 5
Summary: OpenStack Compute (nova) Summary: OpenStack Compute (nova)
License: ASL 2.0 License: ASL 2.0
@ -729,6 +729,9 @@ exit 0
%endif %endif
%changelog %changelog
* Thu Sep 09 2021 ffrog <ljw1101.vip@gmail.com> - 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 <ljw1101.vip@gmail.com> - 23.0.1-4 * Tue Sep 07 2021 ffrog <ljw1101.vip@gmail.com> - 23.0.1-4
- Downgrade the version requirement of qemu from 4.2.0 to 4.1.0 - Downgrade the version requirement of qemu from 4.2.0 to 4.1.0