Fix SSH tunnelling and XenD nodeinfo compat

Fix crash when no auth callback
Fixed auth callback crash and config file reading
2008-01-19 02:20:46 +00:00 · 2008-01-14 04:04:32 +00:00 · 2008-01-02 21:43:05 +00:00 · 2007-12-18 10:44:34 +00:00
4 changed files with 29 additions and 4 deletions
@@ -22,3 +22,4 @@ libvirt-0.3.0.tar.gz
 libvirt-0.3.1.tar.gz
 libvirt-0.3.2.tar.gz
 libvirt-0.3.3.tar.gz
+libvirt-0.4.0.tar.gz
@@ -1 +0,0 @@
-F-8
@@ -0,0 +1,22 @@
+diff -rup libvirt-0.4.0.orig/src/xend_internal.c libvirt-0.4.0.new/src/xend_internal.c
+--- libvirt-0.4.0.orig/src/xend_internal.c	2007-12-17 18:05:27.000000000 -0500
+++ libvirt-0.4.0.new/src/xend_internal.c	2008-01-18 21:13:30.000000000 -0500
+@@ -1907,6 +1907,9 @@ sexpr_to_xend_node_info(struct sexpr *ro
+     info->mhz = sexpr_int(root, "node/cpu_mhz");
+     info->nodes = sexpr_int(root, "node/nr_nodes");
+     info->sockets = sexpr_int(root, "node/sockets_per_node");
+    info->cores = sexpr_int(root, "node/cores_per_socket");
+    info->threads = sexpr_int(root, "node/threads_per_core");
+
+     /* Xen 3.2.0 replaces sockets_per_node with 'nr_cpus'.
+      * Old Xen calculated sockets_per_node using its internal
+      * nr_cpus / (nodes*cores*threads), so fake it ourselves
+@@ -1921,8 +1924,6 @@ sexpr_to_xend_node_info(struct sexpr *ro
+         if (info->sockets == 0)
+             info->sockets = 1;
+     }
+-    info->cores = sexpr_int(root, "node/cores_per_socket");
+-    info->threads = sexpr_int(root, "node/threads_per_core");
+     return (0);
+ }
+ 
@@ -19,6 +19,7 @@ Patch1: libvirt-%{version}-auth-null-cb.patch
 Patch2: libvirt-%{version}-conffile-size.patch
 Patch3: libvirt-%{version}-auth-null-cb-2.patch
 Patch4: libvirt-%{version}-remote-ssh.patch
+Patch5: libvirt-%{version}-nodeinfo-compat.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
@@ -95,6 +96,7 @@ of recent versions of Linux (and other OSes).
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1

 %build
 # Xen is availble only on i386 x86_64 ia64
@@ -220,13 +222,14 @@ fi
 %doc docs/examples/python

 %changelog
-* Thu Jan 17 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-4.fc8
+* Fri Jan 18 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-4.fc9
 - Fix SSH tunnelling (rhbz #428743)
+- Fix back-compat for nodeinfo call changes.

-* Sun Jan 13 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-3.fc8
+* Sun Jan 13 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-3.fc9
 - Fix crash when no auth callback

-* Wed Jan  2 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-2.fc8
+* Wed Jan  2 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-2.fc9
 - Fix reading large config files (rhbz #426425)
 - Fix crash when connecting to a PolicyKit enabled server with not auth callback (rhbz #427107)
Author	SHA1	Message	Date
Daniel P. Berrange	f29ea218b7	Fix SSH tunnelling and XenD nodeinfo compat	2008-01-19 02:20:46 +00:00
Daniel P. Berrange	7d193b7810	Fix crash when no auth callback	2008-01-14 04:04:32 +00:00
Daniel P. Berrange	3182a4df5a	Fixed auth callback crash and config file reading	2008-01-02 21:43:05 +00:00
Daniel Veillard	4f667910e9	Release of 0.4.0, the previous patches are not needed anymore. Daniel	2007-12-18 10:44:34 +00:00