openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: domcaps: Remove dependency on libxl PVUSB support 

Mock out libxlCapsHasPVUSB to always return true, so test results
aren't dependent on host libxl version

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2019-02-08 12:00:22 -05:00
parent b99fdb60b2
commit b79885b7f7
6 changed files with 15 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/domaincapsmock.c
View File

@ -17,6 +17,17 @@
#include <config.h> #include <config.h>
#include "virhostcpu.h" #include "virhostcpu.h"
#ifdef WITH_LIBXL
# include "libxl/libxl_capabilities.h"
#endif
#ifdef WITH_LIBXL
bool
libxlCapsHasPVUSB(void)
{
return true;
}
#endif
int int
virHostCPUGetKVMMaxVCPUs(void) virHostCPUGetKVMMaxVCPUs(void)

78
tests/domaincapsschemadata/libxl-xenfv-usb.xml
View File

@ -1,78 +0,0 @@
<domainCapabilities>
<path>/usr/bin/qemu-system-x86_64</path>
<domain>xen</domain>
<machine>xenfv</machine>
<arch>x86_64</arch>
<vcpu max='128'/>
<iothreads supported='no'/>
<os supported='yes'>
<loader supported='yes'>
<value>/usr/lib/xen/boot/hvmloader</value>
<value>/usr/lib/xen/boot/ovmf.bin</value>
<enum name='type'>
<value>rom</value>
<value>pflash</value>
</enum>
<enum name='readonly'>
<value>yes</value>
</enum>
</loader>
</os>
<cpu>
<mode name='host-passthrough' supported='no'/>
<mode name='host-model' supported='no'/>
<mode name='custom' supported='no'/>
</cpu>
<devices>
<disk supported='yes'>
<enum name='diskDevice'>
<value>disk</value>
<value>cdrom</value>
</enum>
<enum name='bus'>
<value>ide</value>
<value>scsi</value>
<value>xen</value>
</enum>
</disk>
<graphics supported='yes'>
<enum name='type'>
<value>sdl</value>
<value>vnc</value>
<value>spice</value>
</enum>
</graphics>
<video supported='yes'>
<enum name='modelType'>
<value>vga</value>
<value>cirrus</value>
<value>xen</value>
</enum>
</video>
<hostdev supported='yes'>
<enum name='mode'>
<value>subsystem</value>
</enum>
<enum name='startupPolicy'>
<value>default</value>
<value>mandatory</value>
<value>requisite</value>
<value>optional</value>
</enum>
<enum name='subsysType'>
<value>usb</value>
<value>pci</value>
</enum>
<enum name='capsType'/>
<enum name='pciBackend'>
<value>xen</value>
</enum>
</hostdev>
</devices>
<features>
<gic supported='no'/>
<vmcoreinfo supported='no'/>
<genid supported='no'/>
<sev supported='no'/>
</features>
</domainCapabilities>

1
tests/domaincapsschemadata/libxl-xenfv.xml
View File

@ -60,6 +60,7 @@
<value>optional</value> <value>optional</value>
</enum> </enum>
<enum name='subsysType'> <enum name='subsysType'>
<value>usb</value>
<value>pci</value> <value>pci</value>
</enum> </enum>
<enum name='capsType'/> <enum name='capsType'/>

68
tests/domaincapsschemadata/libxl-xenpv-usb.xml
View File

@ -1,68 +0,0 @@
<domainCapabilities>
<path>/usr/bin/qemu-system-x86_64</path>
<domain>xen</domain>
<machine>xenpv</machine>
<arch>x86_64</arch>
<vcpu max='512'/>
<iothreads supported='no'/>
<os supported='yes'>
<loader supported='no'/>
</os>
<cpu>
<mode name='host-passthrough' supported='no'/>
<mode name='host-model' supported='no'/>
<mode name='custom' supported='no'/>
</cpu>
<devices>
<disk supported='yes'>
<enum name='diskDevice'>
<value>disk</value>
<value>cdrom</value>
</enum>
<enum name='bus'>
<value>ide</value>
<value>scsi</value>
<value>xen</value>
</enum>
</disk>
<graphics supported='yes'>
<enum name='type'>
<value>sdl</value>
<value>vnc</value>
<value>spice</value>
</enum>
</graphics>
<video supported='yes'>
<enum name='modelType'>
<value>vga</value>
<value>cirrus</value>
<value>xen</value>
</enum>
</video>
<hostdev supported='yes'>
<enum name='mode'>
<value>subsystem</value>
</enum>
<enum name='startupPolicy'>
<value>default</value>
<value>mandatory</value>
<value>requisite</value>
<value>optional</value>
</enum>
<enum name='subsysType'>
<value>usb</value>
<value>pci</value>
</enum>
<enum name='capsType'/>
<enum name='pciBackend'>
<value>xen</value>
</enum>
</hostdev>
</devices>
<features>
<gic supported='no'/>
<vmcoreinfo supported='no'/>
<genid supported='no'/>
<sev supported='no'/>
</features>
</domainCapabilities>

1
tests/domaincapsschemadata/libxl-xenpv.xml
View File

@ -50,6 +50,7 @@
<value>optional</value> <value>optional</value>
</enum> </enum>
<enum name='subsysType'> <enum name='subsysType'>
<value>usb</value>
<value>pci</value> <value>pci</value>
</enum> </enum>
<enum name='capsType'/> <enum name='capsType'/>

12
tests/domaincapstest.c
View File

@ -508,17 +508,9 @@ mymain(void)
#if WITH_LIBXL #if WITH_LIBXL
# ifdef LIBXL_HAVE_PVUSB DO_TEST_LIBXL("libxl-xenpv", "/usr/bin/qemu-system-x86_64",
# define LIBXL_XENPV_CAPS "libxl-xenpv-usb"
# define LIBXL_XENFV_CAPS "libxl-xenfv-usb"
# else
# define LIBXL_XENPV_CAPS "libxl-xenpv"
# define LIBXL_XENFV_CAPS "libxl-xenfv"
# endif
DO_TEST_LIBXL(LIBXL_XENPV_CAPS, "/usr/bin/qemu-system-x86_64",
"xenpv", "x86_64", VIR_DOMAIN_VIRT_XEN); "xenpv", "x86_64", VIR_DOMAIN_VIRT_XEN);
DO_TEST_LIBXL(LIBXL_XENFV_CAPS, "/usr/bin/qemu-system-x86_64", DO_TEST_LIBXL("libxl-xenfv", "/usr/bin/qemu-system-x86_64",
"xenfv", "x86_64", VIR_DOMAIN_VIRT_XEN); "xenfv", "x86_64", VIR_DOMAIN_VIRT_XEN);
#endif /* WITH_LIBXL */ #endif /* WITH_LIBXL */