forked from pool/libvirt
b3c36f0cbc
9785f2b6-fix-xen-sysctl9.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=235
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
commit 9785f2b6f203ad5f153e68829b95f0e8c30a1560
|
|
Author: Jim Fehlig <jfehlig@suse.com>
|
|
Date: Tue Oct 23 11:18:20 2012 -0600
|
|
|
|
Fix detection of Xen sysctl version 9
|
|
|
|
In commit 371ddc98, I mistakenly added the check for sysctl
|
|
version 9 after setting the hypercall version to 1, which will
|
|
fail with
|
|
|
|
error : xenHypervisorDoV1Op:967 : Unable to issue hypervisor
|
|
ioctl 3166208: Function not implemented
|
|
|
|
This check should be included along with the others that use
|
|
hypercall version 2.
|
|
|
|
Index: libvirt-0.10.2/src/xen/xen_hypervisor.c
|
|
===================================================================
|
|
--- libvirt-0.10.2.orig/src/xen/xen_hypervisor.c
|
|
+++ libvirt-0.10.2/src/xen/xen_hypervisor.c
|
|
@@ -2157,13 +2157,6 @@ xenHypervisorInit(struct xenHypervisorVe
|
|
}
|
|
}
|
|
|
|
- hv_versions.hypervisor = 1;
|
|
- hv_versions.sys_interface = -1;
|
|
- if (virXen_getdomaininfo(fd, 0, &info) == 1) {
|
|
- VIR_DEBUG("Using hypervisor call v1");
|
|
- goto done;
|
|
- }
|
|
-
|
|
/* Xen 4.2
|
|
* sysctl version 9 -> xen-unstable c/s 24102:dc8e55c90604
|
|
* domctl version 8 -> unchanged from Xen 4.1
|
|
@@ -2177,6 +2170,13 @@ xenHypervisorInit(struct xenHypervisorVe
|
|
}
|
|
}
|
|
|
|
+ hv_versions.hypervisor = 1;
|
|
+ hv_versions.sys_interface = -1;
|
|
+ if (virXen_getdomaininfo(fd, 0, &info) == 1) {
|
|
+ VIR_DEBUG("Using hypervisor call v1");
|
|
+ goto done;
|
|
+ }
|
|
+
|
|
/*
|
|
* we failed to make the getdomaininfolist hypercall
|
|
*/
|