On 06/12/2017 07:54 PM, Wim Ten Have wrote:
> From: Wim ten Have <wim.ten.have@xxxxxxxxxx>
>
> Test a bidirectional xen-xl domxml to and from native for numa
> support administration as brought under this patch series.
>
> Signed-off-by: Wim ten Have <wim.ten.have@xxxxxxxxxx>
> ---
> .../test-fullvirt-vnuma-nodistances.cfg | 26 +++++++
> .../test-fullvirt-vnuma-nodistances.xml | 54 +++++++++++++++
> tests/xlconfigdata/test-fullvirt-vnuma.cfg | 26 +++++++
> tests/xlconfigdata/test-fullvirt-vnuma.xml | 81 ++++++++++++++++++++++
> tests/xlconfigtest.c | 4 ++
> 5 files changed, 191 insertions(+)
> create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg
> create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-nodistances.xml
> create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma.cfg
> create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma.xml
>
> diff --git a/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg b/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg
> new file mode 100644
> index 0000000..9871f21
> --- /dev/null
> +++ b/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg
> @@ -0,0 +1,26 @@
> +name = "XenGuest2"
> +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> +maxmem = 8192
> +memory = 8192
> +vcpus = 8
> +pae = 1
> +acpi = 1
> +apic = 1
> +viridian = 0
> +rtc_timeoffset = 0
> +localtime = 0
> +on_poweroff = "destroy"
> +on_reboot = "restart"
> +on_crash = "restart"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
> +sdl = 0
> +vnc = 1
> +vncunused = 1
> +vnclisten = "127.0.0.1"
> +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
> +parallel = "none"
> +serial = "none"
> +builder = "hvm"
> +boot = "d"
> +vnuma = [ [ "pnode=0", "size=2048", "vcpus=0-1", "vdistances=10,21,21,21" ], [ "pnode=1", "size=2048", "vcpus=2-3", "vdistances=21,10,21,21" ], [ "pnode=2", "size=2048", "vcpus=4-5", "vdistances=21,21,10,21" ], [ "pnode=3", "size=2048", "vcpus=6-7", "vdistances=21,21,21,10" ] ]
> +disk = [ "format=raw,vdev=hda,access=rw,backendtype=phy,target=/dev/HostVG/XenGuest2" ]
> diff --git a/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.xml b/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.xml
> new file mode 100644
> index 0000000..a576881
> --- /dev/null
> +++ b/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.xml
> @@ -0,0 +1,54 @@
> +<domain type='xen'>
> + <name>XenGuest2</name>
> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
> + <memory unit='KiB'>8388608</memory>
> + <currentMemory unit='KiB'>8388608</currentMemory>
> + <vcpu placement='static'>8</vcpu>
> + <os>
> + <type arch='x86_64' machine='xenfv'>hvm</type>
> + <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
> + <boot dev='cdrom'/>
> + </os>
> + <features>
> + <acpi/>
> + <apic/>
> + <pae/>
> + </features>
> + <cpu>
> + <topology sockets='4' cores='2' threads='1'/>
We don't set/support topology info then it shouldn't be in the xml. Therefore
the test with nodistances will fail right? In that case <topology/> should be
removed then.
Albeit the other test doesn't have <topology/> element which is good :)
> + <numa>
> + <cell id='0' cpus='0-1' memory='2097152' unit='KiB'/>
> + <cell id='1' cpus='2-3' memory='2097152' unit='KiB'/>
> + <cell id='2' cpus='4-5' memory='2097152' unit='KiB'/>
> + <cell id='3' cpus='6-7' memory='2097152' unit='KiB'/>
> + </numa>
> + </cpu>
> + <clock offset='variable' adjustment='0' basis='utc'/>
> + <on_poweroff>destroy</on_poweroff>
> + <on_reboot>restart</on_reboot>
> + <on_crash>restart</on_crash>
> + <devices>
> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
> + <disk type='block' device='disk'>
> + <driver name='phy' type='raw'/>
> + <source dev='/dev/HostVG/XenGuest2'/>
> + <target dev='hda' bus='ide'/>
> + <address type='drive' controller='0' bus='0' target='0' unit='0'/>
> + </disk>
> + <controller type='ide' index='0'/>
> + <interface type='bridge'>
> + <mac address='00:16:3e:66:92:9c'/>
> + <source bridge='xenbr1'/>
> + <script path='vif-bridge'/>
> + <model type='e1000'/>
> + </interface>
> + <input type='mouse' bus='ps2'/>
> + <input type='keyboard' bus='ps2'/>
> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
> + <listen type='address' address='127.0.0.1'/>
> + </graphics>
> + <video>
> + <model type='cirrus' vram='8192' heads='1' primary='yes'/>
> + </video>
> + </devices>
> +</domain>
> diff --git a/tests/xlconfigdata/test-fullvirt-vnuma.cfg b/tests/xlconfigdata/test-fullvirt-vnuma.cfg
> new file mode 100644
> index 0000000..91e233a
> --- /dev/null
> +++ b/tests/xlconfigdata/test-fullvirt-vnuma.cfg
> @@ -0,0 +1,26 @@
> +name = "XenGuest2"
> +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> +maxmem = 8192
> +memory = 8192
> +vcpus = 8
> +pae = 1
> +acpi = 1
> +apic = 1
> +viridian = 0
> +rtc_timeoffset = 0
> +localtime = 0
> +on_poweroff = "destroy"
> +on_reboot = "restart"
> +on_crash = "restart"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
> +sdl = 0
> +vnc = 1
> +vncunused = 1
> +vnclisten = "127.0.0.1"
> +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
> +parallel = "none"
> +serial = "none"
> +builder = "hvm"
> +boot = "d"
> +vnuma = [ [ "pnode=0", "size=2048", "vcpus=0-1", "vdistances=10,21,31,41" ], [ "pnode=1", "size=2048", "vcpus=2-3", "vdistances=21,10,21,31" ], [ "pnode=2", "size=2048", "vcpus=4-5", "vdistances=31,21,10,21" ], [ "pnode=3", "size=2048", "vcpus=6-7", "vdistances=41,31,21,10" ] ]
> +disk = [ "format=raw,vdev=hda,access=rw,backendtype=phy,target=/dev/HostVG/XenGuest2" ]
> diff --git a/tests/xlconfigdata/test-fullvirt-vnuma.xml b/tests/xlconfigdata/test-fullvirt-vnuma.xml
> new file mode 100644
> index 0000000..5368b0d
> --- /dev/null
> +++ b/tests/xlconfigdata/test-fullvirt-vnuma.xml
> @@ -0,0 +1,81 @@
> +<domain type='xen'>
> + <name>XenGuest2</name>
> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
> + <memory unit='KiB'>8388608</memory>
> + <currentMemory unit='KiB'>8388608</currentMemory>
> + <vcpu placement='static'>8</vcpu>
> + <os>
> + <type arch='x86_64' machine='xenfv'>hvm</type>
> + <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
> + <boot dev='cdrom'/>
> + </os>
> + <features>
> + <acpi/>
> + <apic/>
> + <pae/>
> + </features>
> + <cpu>
> + <numa>
> + <cell id='0' cpus='0-1' memory='2097152' unit='KiB'>
> + <distances>
> + <sibling id='0' value='10'/>
> + <sibling id='1' value='21'/>
> + <sibling id='2' value='31'/>
> + <sibling id='3' value='41'/>
> + </distances>
> + </cell>
> + <cell id='1' cpus='2-3' memory='2097152' unit='KiB'>
> + <distances>
> + <sibling id='0' value='21'/>
> + <sibling id='1' value='10'/>
> + <sibling id='2' value='21'/>
> + <sibling id='3' value='31'/>
> + </distances>
> + </cell>
> + <cell id='2' cpus='4-5' memory='2097152' unit='KiB'>
> + <distances>
> + <sibling id='0' value='31'/>
> + <sibling id='1' value='21'/>
> + <sibling id='2' value='10'/>
> + <sibling id='3' value='21'/>
> + </distances>
> + </cell>
> + <cell id='3' cpus='6-7' memory='2097152' unit='KiB'>
> + <distances>
> + <sibling id='0' value='41'/>
> + <sibling id='1' value='31'/>
> + <sibling id='2' value='21'/>
> + <sibling id='3' value='10'/>
> + </distances>
> + </cell>
> + </numa>
> + </cpu>
> + <clock offset='variable' adjustment='0' basis='utc'/>
> + <on_poweroff>destroy</on_poweroff>
> + <on_reboot>restart</on_reboot>
> + <on_crash>restart</on_crash>
> + <devices>
> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
> + <disk type='block' device='disk'>
> + <driver name='phy' type='raw'/>
> + <source dev='/dev/HostVG/XenGuest2'/>
> + <target dev='hda' bus='ide'/>
> + <address type='drive' controller='0' bus='0' target='0' unit='0'/>
> + </disk>
> + <controller type='ide' index='0'/>
> + <interface type='bridge'>
> + <mac address='00:16:3e:66:92:9c'/>
> + <source bridge='xenbr1'/>
> + <script path='vif-bridge'/>
> + <model type='e1000'/>
> + </interface>
> + <input type='mouse' bus='ps2'/>
> + <input type='keyboard' bus='ps2'/>
> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
> + <listen type='address' address='127.0.0.1'/>
> + </graphics>
> + <video>
> + <model type='cirrus' vram='8192' heads='1' primary='yes'/>
> + </video>
> + </devices>
> +</domain>
> diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
> index 3fe4298..b5c6891 100644
> --- a/tests/xlconfigtest.c
> +++ b/tests/xlconfigtest.c
> @@ -270,6 +270,10 @@ mymain(void)
> DO_TEST("fullvirt-multi-timer");
> DO_TEST("fullvirt-nestedhvm");
> DO_TEST("fullvirt-nestedhvm-disabled");
> +#ifdef LIBXL_HAVE_VNUMA
> + DO_TEST("fullvirt-vnuma");
> + DO_TEST_PARSE("fullvirt-vnuma-nodistances", false);
> +#endif
>
> DO_TEST("paravirt-cmdline");
> DO_TEST_FORMAT("paravirt-cmdline-extra-root", false);
>
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
