From ddf95fa994f2c9cc007e772c0dea8b39b7f25e24 Mon Sep 17 00:00:00 2001 From: "yanjianqing@kylinos.cn" Date: Thu, 29 Feb 2024 15:50:57 +0800 Subject: [PATCH] virt-manager-4.1.0 already support feature dies --- ...at-virt-manager-can-not-support-dies.patch | 47 ------------------- virt-manager.spec | 5 +- 2 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 Fix-bug-that-virt-manager-can-not-support-dies.patch diff --git a/Fix-bug-that-virt-manager-can-not-support-dies.patch b/Fix-bug-that-virt-manager-can-not-support-dies.patch deleted file mode 100644 index 938dba5..0000000 --- a/Fix-bug-that-virt-manager-can-not-support-dies.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 8b09ac9855c051fc4f52538e168f0ddd64bcb963 Mon Sep 17 00:00:00 2001 -From: weishaokun -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 - diff --git a/virt-manager.spec b/virt-manager.spec index ba99ec7..1febaf0 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -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 - 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 - 4.1.0-4 - Update loongarch code -- Gitee