From 154b08a3a7b1f16fefefcc106982a062c065eacd Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Wed, 8 Aug 2018 16:53:45 +0200 Subject: [PATCH] tests: introduce hugepages-nodeset This use-case was broken by commit . We allowed this configuration and it was working as expected therefore we can consider it as regression. We should have never allowed such configuration so now the best solution is in case of non-numa guest silently ignore the 'nodeset' attribute if it's set to '0'. That will be fixed by following patches. Signed-off-by: Pavel Hrdina --- tests/qemuxml2argvdata/hugepages-nodeset.xml | 30 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmloutdata/hugepages-nodeset.xml | 1 + tests/qemuxml2xmltest.c | 1 + 4 files changed, 33 insertions(+) create mode 100644 tests/qemuxml2argvdata/hugepages-nodeset.xml create mode 120000 tests/qemuxml2xmloutdata/hugepages-nodeset.xml diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.xml b/tests/qemuxml2argvdata/hugepages-nodeset.xml new file mode 100644 index 0000000000..4a85ddffad --- /dev/null +++ b/tests/qemuxml2argvdata/hugepages-nodeset.xml @@ -0,0 +1,30 @@ + + SomeDummyHugepagesGuest + ef1bdff4-27f3-4e85-a807-5fb4d58463cc + 1048576 + 1048576 + + + + + + 2 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-i686 + +
+ + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 529f36c504..7721827f40 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -959,6 +959,7 @@ mymain(void) DO_TEST("hugepages-default-2M", NONE); DO_TEST("hugepages-default-system-size", NONE); DO_TEST("hugepages-default-1G-nodeset-2M", NONE); + DO_TEST_FAILURE("hugepages-nodeset", NONE); DO_TEST_FAILURE("hugepages-nodeset-nonexist", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE, diff --git a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml new file mode 120000 index 0000000000..b55838b780 --- /dev/null +++ b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/hugepages-nodeset.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index da6aadd884..7c4a649a6e 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -332,6 +332,7 @@ mymain(void) DO_TEST("hugepages-default-2M", NONE); DO_TEST("hugepages-default-system-size", NONE); DO_TEST("hugepages-default-1G-nodeset-2M", NONE); + DO_TEST("hugepages-nodeset", NONE); DO_TEST("hugepages-numa-default-2M", NONE); DO_TEST("hugepages-numa-default-dimm", NONE); DO_TEST("hugepages-numa-nodeset", NONE);