From f0f7ae2d1caa6c98b6b8770412d27cee360939ad Mon Sep 17 00:00:00 2001 From: Hugues Fafard Date: Mon, 26 Jul 2021 15:48:08 +0200 Subject: [PATCH] cli: --cputune: add emulatorpin.cpuset config Reviewed-by: Cole Robinson --- tests/data/cli/compare/virt-install-singleton-config-2.xml | 2 ++ tests/test_cli.py | 2 +- virtinst/cli.py | 1 + virtinst/domain/cputune.py | 5 ++++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/data/cli/compare/virt-install-singleton-config-2.xml b/tests/data/cli/compare/virt-install-singleton-config-2.xml index b0d72d16f..eca22b33d 100644 --- a/tests/data/cli/compare/virt-install-singleton-config-2.xml +++ b/tests/data/cli/compare/virt-install-singleton-config-2.xml @@ -231,6 +231,7 @@ ignore + @@ -476,6 +477,7 @@ ignore + diff --git a/tests/test_cli.py b/tests/test_cli.py index 2a1245693..9824df9c1 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -514,7 +514,7 @@ cell0.distances.sibling1.id=1,cell0.distances.sibling1.value=21,\ numa.cell1.distances.sibling0.id=0,numa.cell1.distances.sibling0.value=21,\ cell1.distances.sibling1.id=1,cell1.distances.sibling1.value=10,\ cache.mode=emulate,cache.level=3 ---cputune vcpupin0.vcpu=0,vcpupin0.cpuset=0-3,cachetune0.vcpus=0-3,cachetune0.cache0.level=3,cachetune0.cache0.id=0,cachetune0.cache0.type=both,cachetune0.cache0.size=3,cachetune0.cache0.unit=MiB,memorytune0.vcpus=0-3,memorytune0.node0.id=0,memorytune0.node0.bandwidth=60,vcpusched0.vcpus=0-3,^2,vcpusched0.scheduler=fifo,vcpusched0.priority=95 +--cputune vcpupin0.vcpu=0,vcpupin0.cpuset=0-3,emulatorpin.cpuset=1,7,cachetune0.vcpus=0-3,cachetune0.cache0.level=3,cachetune0.cache0.id=0,cachetune0.cache0.type=both,cachetune0.cache0.size=3,cachetune0.cache0.unit=MiB,memorytune0.vcpus=0-3,memorytune0.node0.id=0,memorytune0.node0.bandwidth=60,vcpusched0.vcpus=0-3,^2,vcpusched0.scheduler=fifo,vcpusched0.priority=95 --iothreads iothreads=2,iothreadids.iothread1.id=1,iothreadids.iothread2.id=2 --metadata title=my-title,description=my-description,uuid=00000000-1111-2222-3333-444444444444,genid=e9392370-2917-565e-692b-d057f46512d6 --boot cdrom,fd,hd,network,menu=off,loader=/foo/bar,emulator=/new/emu,bootloader=/new/bootld,rebootTimeout=3,initargs="foo=bar baz=woo",initdir=/my/custom/cwd,inituser=tester,initgroup=1000,firmware=efi diff --git a/virtinst/cli.py b/virtinst/cli.py index 29db54c00..48a3a9363 100644 --- a/virtinst/cli.py +++ b/virtinst/cli.py @@ -2394,6 +2394,7 @@ class ParserCputune(VirtCLIParser): find_inst_cb=cls.vcpu_find_inst_cb) cls.add_arg("vcpupin[0-9]*.cpuset", "cpuset", can_comma=True, find_inst_cb=cls.vcpu_find_inst_cb) + cls.add_arg("emulatorpin.cpuset", "emulatorpin_cpuset", can_comma=True) cls.add_arg("vcpusched[0-9]*.vcpus", "vcpus", can_comma=True, find_inst_cb=cls.vcpusched_find_inst_cb) cls.add_arg("vcpusched[0-9]*.scheduler", "scheduler", diff --git a/virtinst/domain/cputune.py b/virtinst/domain/cputune.py index 73398d22b..9e84e1f6a 100644 --- a/virtinst/domain/cputune.py +++ b/virtinst/domain/cputune.py @@ -80,9 +80,12 @@ class DomainCputune(XMLBuilder): Class for generating XML """ XML_NAME = "cputune" - _XML_PROP_ORDER = ["vcpus", "cachetune", "memorytune", "vcpusched"] + _XML_PROP_ORDER = ["vcpus", "emulatorpin_cpuset", "cachetune", + "memorytune", "vcpusched"] vcpus = XMLChildProperty(_VCPUPin) cachetune = XMLChildProperty(_CacheTuneCPU) memorytune = XMLChildProperty(_MemoryTuneCPU) vcpusched = XMLChildProperty(_VCPUSched) + + emulatorpin_cpuset = XMLProperty("./emulatorpin/@cpuset")