This commit is contained in:
parent
f986dc741f
commit
f537a560fa
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 24 14:00:06 MDT 2008 - jfehlig@novell.com
|
||||
|
||||
- Fix Xen 3.2 hypercalls. bnc#378798
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 10 11:43:14 MDT 2008 - jfehlig@novell.com
|
||||
|
||||
|
@ -20,7 +20,7 @@ License: LGPL v2.1 or later
|
||||
Group: Development/Libraries/C and C++
|
||||
AutoReqProv: yes
|
||||
Version: 0.4.0
|
||||
Release: 38
|
||||
Release: 43
|
||||
Summary: A C toolkit to interract with the virtualization capabilities of Linux
|
||||
Requires: dnsmasq
|
||||
Requires: bridge-utils
|
||||
@ -33,6 +33,7 @@ Requires: PolicyKit >= 0.6
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Source1: libvirtd.init
|
||||
Patch0: auth-callback.patch
|
||||
Patch1: xen-3_2-hypercall.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
ExclusiveArch: %ix86 x86_64
|
||||
%define _libexecdir %{_prefix}/lib/%{name}
|
||||
@ -123,6 +124,7 @@ Authors:
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
rm po/no.*
|
||||
|
||||
%build
|
||||
@ -231,6 +233,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{py_sitedir}/libvirtmod*
|
||||
|
||||
%changelog
|
||||
* Thu Apr 24 2008 jfehlig@novell.com
|
||||
- Fix Xen 3.2 hypercalls. bnc#378798
|
||||
* Thu Apr 10 2008 jfehlig@novell.com
|
||||
- Fix NULL pointer dereference in auth callback. bnc#373180,
|
||||
bnc#354995
|
||||
|
32
xen-3_2-hypercall.patch
Normal file
32
xen-3_2-hypercall.patch
Normal file
@ -0,0 +1,32 @@
|
||||
Index: libvirt-0.4.0/src/xen_internal.c
|
||||
===================================================================
|
||||
--- libvirt-0.4.0.orig/src/xen_internal.c
|
||||
+++ libvirt-0.4.0/src/xen_internal.c
|
||||
@@ -2006,7 +2006,7 @@ xenHypervisorInit(void)
|
||||
|
||||
sys_interface_version = 4; /* XEN_SYSCTL_INTERFACE_VERSION */
|
||||
if (virXen_getdomaininfo(fd, 0, &info) == 1) {
|
||||
- /* xen-unstable */
|
||||
+ /* Fedora 8 */
|
||||
dom_interface_version = 5; /* XEN_DOMCTL_INTERFACE_VERSION */
|
||||
if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
|
||||
#ifdef DEBUG
|
||||
@@ -2016,6 +2016,18 @@ xenHypervisorInit(void)
|
||||
}
|
||||
}
|
||||
|
||||
+ sys_interface_version = 6; /* XEN_SYSCTL_INTERFACE_VERSION */
|
||||
+ if (virXen_getdomaininfo(fd, 0, &info) == 1) {
|
||||
+ /* Xen 3.2, Fedora 9 */
|
||||
+ dom_interface_version = 5; /* XEN_DOMCTL_INTERFACE_VERSION */
|
||||
+ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
|
||||
+#ifdef DEBUG
|
||||
+ fprintf(stderr, "Using hypervisor call v2, sys ver6 dom ver5\n");
|
||||
+#endif
|
||||
+ goto done;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
hypervisor_version = 1;
|
||||
sys_interface_version = -1;
|
||||
if (virXen_getdomaininfo(fd, 0, &info) == 1) {
|
Loading…
Reference in New Issue
Block a user