Re: [libvirt] [PATCH v2 2/2] Xen: Fake versions in xencapstest

virInitialize() → xenRegister() → xenhypervisorInit() determins the

version of the Hypervisor. This breaks xencapstest when building as root on a dom0 system, since xenHypervisorBuildCapabilities() adds the "hap" and "viridian" features based on the detected version. Add an optional parameter to xenhypervisorInit() to disable automatic detection of the Hypervisor version. The passed in arguments are used instead. Signed-off-by: Philipp Hahn<hahn(a)univention.de> --- src/xen/xen_driver.c | 2 +- src/xen/xen_hypervisor.c | 14 ++++++++++++-- src/xen/xen_hypervisor.h | 2 +- tests/xencapstest.c | 10 ++++++++++ 4 files changed, 24 insertions(+), 4 deletions(-)

+++ b/src/xen/xen_hypervisor.c @@ -1951,12 +1951,16 @@ virXen_getvcpusinfo(int handle, int id, unsigned int vcpu, virVcpuInfoPtr ipt, /** * xenHypervisorInit: + * @override_versions: pointer to optional struct xenHypervisorVersions with + * version informations used instead of automatic version detection.

+++ b/tests/xencapstest.c @@ -145,11 +145,21 @@ static int testXenppc64(const void *data ATTRIBUTE_UNUSED) { } +/* Fake initialization data for xenHypervisorInit(). Must be initialized + * explicitly before the implicit call via virInitialize(). */ +static struct xenHypervisorVersions hv_versions = { + .hv = 0, + .hypervisor = 2, + .sys_interface = -1, + .dom_interface = -1