!42 virt-manager-4.1.0已经支持图形化界面手动设置拓扑后取消保存报错,PR27需要回退

From: @yanjianqing_kylin 
Reviewed-by: @jxy_git 
Signed-off-by: @jxy_git
This commit is contained in:
openeuler-ci-bot 2024-02-29 08:13:51 +00:00 committed by Gitee
commit 357a66f95c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 4 additions and 48 deletions

View File

@ -1,47 +0,0 @@
From 8b09ac9855c051fc4f52538e168f0ddd64bcb963 Mon Sep 17 00:00:00 2001
From: weishaokun <weishaokun@kylinos.cn>
Date: Thu, 1 Feb 2024 15:28:17 +0800
Subject: [PATCH] fix bug that virt-manager can not support dies
Change-Id: Id791f0d9e93613e8085167753a292deb5c7b4db7
---
virtManager/object/domain.py | 1 +
virtinst/domain/cpu.py | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/virtManager/object/domain.py b/virtManager/object/domain.py
index f61f0f5..9ebda3f 100644
--- a/virtManager/object/domain.py
+++ b/virtManager/object/domain.py
@@ -464,6 +464,7 @@ class vmmDomain(vmmLibvirtObject):
guest.cpu.sockets = sockets
guest.cpu.cores = cores
guest.cpu.threads = threads
+ guest.cpu.dies = None
if secure != _SENTINEL or model != _SENTINEL:
guest.cpu.secure = secure
diff --git a/virtinst/domain/cpu.py b/virtinst/domain/cpu.py
index 5fb3d22..b671f04 100644
--- a/virtinst/domain/cpu.py
+++ b/virtinst/domain/cpu.py
@@ -65,7 +65,7 @@ class DomainCpu(XMLBuilder):
"""
XML_NAME = "cpu"
_XML_PROP_ORDER = ["mode", "match", "model", "vendor",
- "sockets", "cores", "threads", "features"]
+ "sockets", "cores", "threads", "dies", "features"]
secure = True
@@ -264,6 +264,7 @@ class DomainCpu(XMLBuilder):
sockets = XMLProperty("./topology/@sockets", is_int=True)
cores = XMLProperty("./topology/@cores", is_int=True)
threads = XMLProperty("./topology/@threads", is_int=True)
+ dies = XMLProperty("./topology/@dies", is_int=True)
##################
--
2.20.1

View File

@ -2,7 +2,7 @@
Name: virt-manager
Version: 4.1.0
Release: 4
Release: 5
Summary: The manage virtual machines tool which via libvirt.
License: GPLv2+
BuildArch: noarch
@ -90,6 +90,9 @@ done
%{_mandir}/man1/{virt-install.1*,virt-clone.1*,virt-xml.1*}
%changelog
* Thu Feb 29 2024 yanjianqing <yanjianqing@kylinos.cn> - 4.1.0-5
- delete Fix-bug-that-virt-manager-can-not-support-dies.patch,virt-manager-4.1.0 support dies
* Thu Feb 29 2024 lixianglai <lixianglai@loongson.cn> - 4.1.0-4
- Update loongarch code