rpms/libvirt/FC-6 libvirt-0.2.2-pvfb-new-config.patch, NONE, 1.1 libvirt.spec, 1.44, 1.45

[fedora-cvs-commits at redhat.com]

Author: veillard

Update of /cvs/dist/rpms/libvirt/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv13420

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.2.2-pvfb-new-config.patch 
Log Message:
The pvfb patch needed to be updated, Daniel


libvirt-0.2.2-pvfb-new-config.patch:
 xml.c |    4 !!!!
 1 files changed, 4 modifications(!)

--- NEW FILE libvirt-0.2.2-pvfb-new-config.patch ---
*** libvirt-0.2.2/src/xml.c.orig	2007-04-19 14:48:28.000000000 +0200
--- libvirt-0.2.2/src/xml.c	2007-04-19 14:49:29.000000000 +0200
*************** virDomainParseXMLOSDescPV(virConnectPtr 
*** 826,832 ****
          virBufferVSprintf(buf, "(args '%s')", (const char *) cmdline);
  
      /* PV graphics for xen <= 3.0.4 */
!     if (xendConfigVersion < 3) {
          cur = virXPathNode("/domain/devices/graphics[1]", ctxt);
          if (cur != NULL) {
              res = virDomainParseXMLGraphicsDescImage(conn, cur, buf,
--- 826,832 ----
          virBufferVSprintf(buf, "(args '%s')", (const char *) cmdline);
  
      /* PV graphics for xen <= 3.0.4 */
!     if (xendConfigVersion < 2) {
          cur = virXPathNode("/domain/devices/graphics[1]", ctxt);
          if (cur != NULL) {
              res = virDomainParseXMLGraphicsDescImage(conn, cur, buf,
*************** virDomainParseXMLDesc(virConnectPtr conn
*** 1348,1354 ****
  
      /* New style PV graphics config xen >= 3.0.4,
       * or HVM graphics config xen >= 3.0.5 */
!     if ((xendConfigVersion >= 3 && !hvm) ||
          (xendConfigVersion >= 4 && hvm)) {
          nb_nodes = virXPathNodeSet("/domain/devices/graphics", ctxt, &nodes);
          if (nb_nodes > 0) {
--- 1348,1354 ----
  
      /* New style PV graphics config xen >= 3.0.4,
       * or HVM graphics config xen >= 3.0.5 */
!     if ((xendConfigVersion >= 2 && !hvm) ||
          (xendConfigVersion >= 4 && hvm)) {
          nb_nodes = virXPathNodeSet("/domain/devices/graphics", ctxt, &nodes);
          if (nb_nodes > 0) {


Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/FC-6/libvirt.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- libvirt.spec	19 Apr 2007 12:43:24 -0000	1.44
+++ libvirt.spec	19 Apr 2007 12:51:35 -0000	1.45
@@ -29,7 +29,7 @@
 BuildRequires: /sbin/iptables
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64 ia64
-Patch0:libvirt-0.2.0-pvfb-new-config.patch
+Patch0:libvirt-0.2.2-pvfb-new-config.patch
 
 %description
 Libvirt is a C toolkit to interract with the virtualization capabilities