forked from pool/libvirt
f167ba3466
- apparmor: don't fail on non-apparmor <seclabel> apparmor-errormsg-fix.patch, apparmor-alt-seclabel.patch bsc#1023436 - libxl: fix reporting of domain maximum memory ff225538-libxl-autoballoon-setting.patch, c89a6e78-libxl-physinfo-cleanup.patch, d2b77608-libxl-maxmem-fix.patch, 79692c38-libxl-dom0-maxmem.patch bsc#1017762 - libxl: set disk format to raw if not specified and fix disk detach 321a28c6-libxl-default-disk-format.patch, bd116810-libxl-fix-disk-detach.patch bsc#1003379 - libxl: fix timer configurations 6e4759d0-libxl-timer-fix.patch, 87df87e0-libxl-timer-tsc-emulate.patch, b4386fda-xenconfig-timer-fix.patch, d3970925-timer-tests.patch bsc#1019969 OBS-URL: https://build.opensuse.org/request/show/456194 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=583
326 lines
11 KiB
Diff
326 lines
11 KiB
Diff
commit d397092591518006b41131f9fc921f74248e60a3
|
|
Author: Jim Fehlig <jfehlig@suse.com>
|
|
Date: Thu Jan 19 17:19:18 2017 -0700
|
|
|
|
tests: add xlconfig tests for <timer> configurations
|
|
|
|
Index: libvirt-3.0.0/tests/xlconfigdata/test-fullvirt-hpet-timer.cfg
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ libvirt-3.0.0/tests/xlconfigdata/test-fullvirt-hpet-timer.cfg
|
|
@@ -0,0 +1,27 @@
|
|
+name = "XenGuest2"
|
|
+uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
|
|
+maxmem = 579
|
|
+memory = 394
|
|
+vcpus = 1
|
|
+pae = 1
|
|
+acpi = 1
|
|
+apic = 1
|
|
+hap = 0
|
|
+viridian = 0
|
|
+hpet = 1
|
|
+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,rate=10240KB/s" ]
|
|
+parallel = "none"
|
|
+serial = "none"
|
|
+builder = "hvm"
|
|
+boot = "d"
|
|
+disk = [ "format=raw,vdev=hda,access=rw,backendtype=phy,target=/dev/HostVG/XenGuest2", "format=qcow2,vdev=hdb,access=rw,backendtype=qdisk,target=/var/lib/libvirt/images/XenGuest2-home", "format=raw,vdev=hdc,access=ro,backendtype=qdisk,devtype=cdrom,target=/root/boot.iso" ]
|
|
Index: libvirt-3.0.0/tests/xlconfigdata/test-fullvirt-hpet-timer.xml
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ libvirt-3.0.0/tests/xlconfigdata/test-fullvirt-hpet-timer.xml
|
|
@@ -0,0 +1,64 @@
|
|
+<domain type='xen'>
|
|
+ <name>XenGuest2</name>
|
|
+ <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
|
|
+ <memory unit='KiB'>592896</memory>
|
|
+ <currentMemory unit='KiB'>403456</currentMemory>
|
|
+ <vcpu placement='static'>1</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/>
|
|
+ <hap state='off'/>
|
|
+ </features>
|
|
+ <clock offset='variable' adjustment='0' basis='utc'>
|
|
+ <timer name='hpet' present='yes'/>
|
|
+ </clock>
|
|
+ <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>
|
|
+ <disk type='file' device='disk'>
|
|
+ <driver name='qemu' type='qcow2'/>
|
|
+ <source file='/var/lib/libvirt/images/XenGuest2-home'/>
|
|
+ <target dev='hdb' bus='ide'/>
|
|
+ <address type='drive' controller='0' bus='0' target='0' unit='1'/>
|
|
+ </disk>
|
|
+ <disk type='file' device='cdrom'>
|
|
+ <driver name='qemu' type='raw'/>
|
|
+ <source file='/root/boot.iso'/>
|
|
+ <target dev='hdc' bus='ide'/>
|
|
+ <readonly/>
|
|
+ <address type='drive' controller='0' bus='1' target='0' unit='0'/>
|
|
+ </disk>
|
|
+ <controller type='ide' index='0'/>
|
|
+ <interface type='bridge'>
|
|
+ <mac address='00:16:3e:66:92:9c'/>
|
|
+ <source bridge='xenbr1'/>
|
|
+ <bandwidth>
|
|
+ <outbound average='10240'/>
|
|
+ </bandwidth>
|
|
+ <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>
|
|
Index: libvirt-3.0.0/tests/xlconfigdata/test-fullvirt-multi-timer.cfg
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ libvirt-3.0.0/tests/xlconfigdata/test-fullvirt-multi-timer.cfg
|
|
@@ -0,0 +1,28 @@
|
|
+name = "XenGuest2"
|
|
+uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
|
|
+maxmem = 579
|
|
+memory = 394
|
|
+vcpus = 1
|
|
+pae = 1
|
|
+acpi = 1
|
|
+apic = 1
|
|
+hap = 0
|
|
+viridian = 0
|
|
+tsc_mode = "native"
|
|
+hpet = 1
|
|
+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,rate=10240KB/s" ]
|
|
+parallel = "none"
|
|
+serial = "none"
|
|
+builder = "hvm"
|
|
+boot = "d"
|
|
+disk = [ "format=raw,vdev=hda,access=rw,backendtype=phy,target=/dev/HostVG/XenGuest2", "format=qcow2,vdev=hdb,access=rw,backendtype=qdisk,target=/var/lib/libvirt/images/XenGuest2-home", "format=raw,vdev=hdc,access=ro,backendtype=qdisk,devtype=cdrom,target=/root/boot.iso" ]
|
|
Index: libvirt-3.0.0/tests/xlconfigdata/test-fullvirt-multi-timer.xml
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ libvirt-3.0.0/tests/xlconfigdata/test-fullvirt-multi-timer.xml
|
|
@@ -0,0 +1,65 @@
|
|
+<domain type='xen'>
|
|
+ <name>XenGuest2</name>
|
|
+ <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
|
|
+ <memory unit='KiB'>592896</memory>
|
|
+ <currentMemory unit='KiB'>403456</currentMemory>
|
|
+ <vcpu placement='static'>1</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/>
|
|
+ <hap state='off'/>
|
|
+ </features>
|
|
+ <clock offset='variable' adjustment='0' basis='utc'>
|
|
+ <timer name='tsc' present='yes' mode='native'/>
|
|
+ <timer name='hpet' present='yes'/>
|
|
+ </clock>
|
|
+ <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>
|
|
+ <disk type='file' device='disk'>
|
|
+ <driver name='qemu' type='qcow2'/>
|
|
+ <source file='/var/lib/libvirt/images/XenGuest2-home'/>
|
|
+ <target dev='hdb' bus='ide'/>
|
|
+ <address type='drive' controller='0' bus='0' target='0' unit='1'/>
|
|
+ </disk>
|
|
+ <disk type='file' device='cdrom'>
|
|
+ <driver name='qemu' type='raw'/>
|
|
+ <source file='/root/boot.iso'/>
|
|
+ <target dev='hdc' bus='ide'/>
|
|
+ <readonly/>
|
|
+ <address type='drive' controller='0' bus='1' target='0' unit='0'/>
|
|
+ </disk>
|
|
+ <controller type='ide' index='0'/>
|
|
+ <interface type='bridge'>
|
|
+ <mac address='00:16:3e:66:92:9c'/>
|
|
+ <source bridge='xenbr1'/>
|
|
+ <bandwidth>
|
|
+ <outbound average='10240'/>
|
|
+ </bandwidth>
|
|
+ <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>
|
|
Index: libvirt-3.0.0/tests/xlconfigdata/test-fullvirt-tsc-timer.cfg
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ libvirt-3.0.0/tests/xlconfigdata/test-fullvirt-tsc-timer.cfg
|
|
@@ -0,0 +1,27 @@
|
|
+name = "XenGuest2"
|
|
+uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
|
|
+maxmem = 579
|
|
+memory = 394
|
|
+vcpus = 1
|
|
+pae = 1
|
|
+acpi = 1
|
|
+apic = 1
|
|
+hap = 0
|
|
+viridian = 0
|
|
+tsc_mode = "native"
|
|
+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,rate=10240KB/s" ]
|
|
+parallel = "none"
|
|
+serial = "none"
|
|
+builder = "hvm"
|
|
+boot = "d"
|
|
+disk = [ "format=raw,vdev=hda,access=rw,backendtype=phy,target=/dev/HostVG/XenGuest2", "format=qcow2,vdev=hdb,access=rw,backendtype=qdisk,target=/var/lib/libvirt/images/XenGuest2-home", "format=raw,vdev=hdc,access=ro,backendtype=qdisk,devtype=cdrom,target=/root/boot.iso" ]
|
|
Index: libvirt-3.0.0/tests/xlconfigdata/test-fullvirt-tsc-timer.xml
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ libvirt-3.0.0/tests/xlconfigdata/test-fullvirt-tsc-timer.xml
|
|
@@ -0,0 +1,64 @@
|
|
+<domain type='xen'>
|
|
+ <name>XenGuest2</name>
|
|
+ <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
|
|
+ <memory unit='KiB'>592896</memory>
|
|
+ <currentMemory unit='KiB'>403456</currentMemory>
|
|
+ <vcpu placement='static'>1</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/>
|
|
+ <hap state='off'/>
|
|
+ </features>
|
|
+ <clock offset='variable' adjustment='0' basis='utc'>
|
|
+ <timer name='tsc' present='yes' mode='native'/>
|
|
+ </clock>
|
|
+ <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>
|
|
+ <disk type='file' device='disk'>
|
|
+ <driver name='qemu' type='qcow2'/>
|
|
+ <source file='/var/lib/libvirt/images/XenGuest2-home'/>
|
|
+ <target dev='hdb' bus='ide'/>
|
|
+ <address type='drive' controller='0' bus='0' target='0' unit='1'/>
|
|
+ </disk>
|
|
+ <disk type='file' device='cdrom'>
|
|
+ <driver name='qemu' type='raw'/>
|
|
+ <source file='/root/boot.iso'/>
|
|
+ <target dev='hdc' bus='ide'/>
|
|
+ <readonly/>
|
|
+ <address type='drive' controller='0' bus='1' target='0' unit='0'/>
|
|
+ </disk>
|
|
+ <controller type='ide' index='0'/>
|
|
+ <interface type='bridge'>
|
|
+ <mac address='00:16:3e:66:92:9c'/>
|
|
+ <source bridge='xenbr1'/>
|
|
+ <bandwidth>
|
|
+ <outbound average='10240'/>
|
|
+ </bandwidth>
|
|
+ <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>
|
|
Index: libvirt-3.0.0/tests/xlconfigtest.c
|
|
===================================================================
|
|
--- libvirt-3.0.0.orig/tests/xlconfigtest.c
|
|
+++ libvirt-3.0.0/tests/xlconfigtest.c
|
|
@@ -265,6 +265,9 @@ mymain(void)
|
|
DO_TEST("spice-features");
|
|
DO_TEST("vif-rate");
|
|
DO_TEST("fullvirt-nohap");
|
|
+ DO_TEST("fullvirt-hpet-timer");
|
|
+ DO_TEST("fullvirt-tsc-timer");
|
|
+ DO_TEST("fullvirt-multi-timer");
|
|
|
|
DO_TEST("paravirt-cmdline");
|
|
DO_TEST_FORMAT("paravirt-cmdline-extra-root", false);
|