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 a7dfe7c4..121ffa41 100644 --- a/tests/data/cli/compare/virt-install-singleton-config-2.xml +++ b/tests/data/cli/compare/virt-install-singleton-config-2.xml @@ -153,7 +153,7 @@ - + @@ -426,7 +426,7 @@ - + diff --git a/tests/test_cli.py b/tests/test_cli.py index f04a296a..c58a9ebe 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -509,7 +509,7 @@ c.add_compare("""--pxe --cpu foobar,+x2apic,+x2apicagain,-distest,forbid=foo,forbid=bar,disable=distest2,optional=opttest,require=reqtest,match=strict,vendor=meee,mode=custom,check=partial,\ cell.id=0,cell.cpus=1,2,3,cell.memory=1024,\ cell1.id=1,cell1.memory=256,cell1.cpus=5-8,\ -numa.cell2.id=2,numa.cell2.memory=256,numa.cell2.cpus=4,numa.cell2.memAccess=shared,numa.cell2.discard=no,\ +numa.cell2.id=2,numa.cell2.memory=256,numa.cell2.unit=KiB,numa.cell2.cpus=4,numa.cell2.memAccess=shared,numa.cell2.discard=no,\ cell0.distances.sibling0.id=0,cell0.distances.sibling0.value=10,\ cell0.distances.sibling1.id=1,cell0.distances.sibling1.value=21,\ numa.cell1.distances.sibling0.id=0,numa.cell1.distances.sibling0.value=21,\ diff --git a/virtinst/cli.py b/virtinst/cli.py index e64d8ba1..6daea26a 100644 --- a/virtinst/cli.py +++ b/virtinst/cli.py @@ -2338,6 +2338,9 @@ class ParserCPU(VirtCLIParser): find_inst_cb=cls.cell_find_inst_cb) cls.add_arg("numa.cell[0-9]*.memory", "memory", find_inst_cb=cls.cell_find_inst_cb) + cls.add_arg("numa.cell[0-9]*.unit", "unit", + find_inst_cb=cls.cell_find_inst_cb) + cls.add_arg("numa.cell[0-9]*.distances.sibling[0-9]*.id", "id", find_inst_cb=cls.sibling_find_inst_cb) cls.add_arg("numa.cell[0-9]*.distances.sibling[0-9]*.value", "value", diff --git a/virtinst/domain/cpu.py b/virtinst/domain/cpu.py index 77ed0f19..1bc4d3fd 100644 --- a/virtinst/domain/cpu.py +++ b/virtinst/domain/cpu.py @@ -31,6 +31,7 @@ class _CPUCell(XMLBuilder): id = XMLProperty("./@id", is_int=True) cpus = XMLProperty("./@cpus") memory = XMLProperty("./@memory", is_int=True) + unit = XMLProperty("./@unit") memAccess = XMLProperty("./@memAccess") discard = XMLProperty("./@discard") siblings = XMLChildProperty(_CPUCellSibling, relative_xpath="./distances")