From 684f3914cdb18ec3da53decd750732db1d1dfe07 Mon Sep 17 00:00:00 2001 From: Jonathon Jongsma Date: Thu, 11 Nov 2021 11:31:37 -0600 Subject: [PATCH] virt-manager-3.2.0-10.el9 - cli: introduce --resource fibrechannel.appid option (rhbz#2011328) Resolves: rhbz#2011328 --- ...e-resource-fibrechannel.appid-option.patch | 71 +++++++++++++++++++ virt-manager.spec | 6 +- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 virt-manager-cli-introduce-resource-fibrechannel.appid-option.patch diff --git a/virt-manager-cli-introduce-resource-fibrechannel.appid-option.patch b/virt-manager-cli-introduce-resource-fibrechannel.appid-option.patch new file mode 100644 index 0000000..cc6a3fd --- /dev/null +++ b/virt-manager-cli-introduce-resource-fibrechannel.appid-option.patch @@ -0,0 +1,71 @@ +From ddedf5e1b34568adbbfed6a052bf96b7d1eda6f1 Mon Sep 17 00:00:00 2001 +From: Pavel Hrdina +Date: Tue, 14 Sep 2021 17:08:35 +0200 +Subject: [PATCH] cli: introduce --resource fibrechannel.appid option + +Signed-off-by: Pavel Hrdina +(cherry picked from commit 0953e1aea1fd16cd1825c03f3b032c7f12f3322f) + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2011328 + +Signed-off-by: Jonathon Jongsma +--- + tests/data/cli/compare/virt-install-singleton-config-1.xml | 1 + + tests/test_cli.py | 2 +- + virtinst/cli.py | 1 + + virtinst/domain/resource.py | 3 ++- + 4 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/tests/data/cli/compare/virt-install-singleton-config-1.xml b/tests/data/cli/compare/virt-install-singleton-config-1.xml +index 518a0099..b50d806e 100644 +--- a/tests/data/cli/compare/virt-install-singleton-config-1.xml ++++ b/tests/data/cli/compare/virt-install-singleton-config-1.xml +@@ -19,6 +19,7 @@ + + + /virtualmachines/production ++ + + + hvm +diff --git a/tests/test_cli.py b/tests/test_cli.py +index 4b714e3e..aba1fe3c 100644 +--- a/tests/test_cli.py ++++ b/tests/test_cli.py +@@ -480,7 +480,7 @@ c.add_compare(""" + --memorybacking hugepages=on + --features apic=off + --clock offset=localtime +---resource /virtualmachines/production ++--resource /virtualmachines/production,fibrechannel.appid=myapplication + --events on_crash=restart + --metadata genid_enable=yes + --sysinfo host +diff --git a/virtinst/cli.py b/virtinst/cli.py +index 8e5b13cd..e1a988f9 100644 +--- a/virtinst/cli.py ++++ b/virtinst/cli.py +@@ -1999,6 +1999,7 @@ class ParserResource(VirtCLIParser): + def _init_class(cls, **kwargs): + VirtCLIParser._init_class(**kwargs) + cls.add_arg("partition", "partition") ++ cls.add_arg("fibrechannel.appid", "fibrechannel_appid", can_comma=True) + + + ###################### +diff --git a/virtinst/domain/resource.py b/virtinst/domain/resource.py +index d0962db9..8ad3df54 100644 +--- a/virtinst/domain/resource.py ++++ b/virtinst/domain/resource.py +@@ -14,6 +14,7 @@ class DomainResource(XMLBuilder): + """ + + XML_NAME = "resource" +- _XML_PROP_ORDER = ["partition"] ++ _XML_PROP_ORDER = ["partition", "fibrechannel_appid"] + + partition = XMLProperty("./partition") ++ fibrechannel_appid = XMLProperty("./fibrechannel/@appid") +-- +2.31.1 + diff --git a/virt-manager.spec b/virt-manager.spec index c34a270..43b338c 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -8,7 +8,7 @@ Name: virt-manager Version: 3.2.0 -Release: 9%{?dist}%{?extra_release} +Release: 10%{?dist}%{?extra_release} %global verrel %{version}-%{release} Summary: Desktop tool for managing virtual machines via libvirt @@ -29,6 +29,7 @@ Patch8: virt-manager-virt-xml-add-support-for-mediated-devices.patch Patch9: virt-manager-hostdev-use-method-get_mdev_uuid.patch Patch10: virt-manager-tests-verify-MDEV-support.patch Patch11: virt-manager-virt-manager-enable-MDEV-support.patch +Patch12: virt-manager-cli-introduce-resource-fibrechannel.appid-option.patch Requires: virt-manager-common = %{verrel} @@ -186,6 +187,9 @@ done %changelog +* Thu Nov 11 2021 Jonathon Jongsma - 3.2.0-10 +- cli: introduce --resource fibrechannel.appid option (rhbz#2011328) + * Thu Sep 9 2021 Jonathon Jongsma - 3.2.0-9 - virt-install: add mediated device (rhbz#1995131) - virt-xml: add support for mediated devices (rhbz#1995131)