rpms/xen/devel xen-console-log.patch,1.1,1.2

[Daniel P. Berrange (berrange)]

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29365

Modified Files:
	xen-console-log.patch 
Log Message:
Refresh patch

xen-console-log.patch:

Index: xen-console-log.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-console-log.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-console-log.patch	12 Jun 2007 13:50:13 -0000	1.1
+++ xen-console-log.patch	23 Aug 2007 14:40:07 -0000	1.2
@@ -1,6 +1,6 @@
 diff -rup xen-3.1.0-src/tools/console/daemon/io.c xen-3.1.0-src.new/tools/console/daemon/io.c
 --- xen-3.1.0-src/tools/console/daemon/io.c	2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/console/daemon/io.c	2007-06-12 09:32:25.000000000 -0400
++++ xen-3.1.0-src.new/tools/console/daemon/io.c	2007-06-12 10:27:43.000000000 -0400
 @@ -44,6 +44,14 @@
  /* Each 10 bits takes ~ 3 digits, plus one, plus one for nul terminator. */
  #define MAX_STRLEN(x) ((sizeof(x) * CHAR_BIT + CHAR_BIT-1) / 10 * 3 + 2)
@@ -44,7 +44,7 @@
  	if (buffer->max_capacity &&
  	    buffer->size > buffer->max_capacity) {
  		/* Discard the middle of the data. */
-@@ -144,6 +166,53 @@ static bool domain_is_valid(int domid)
+@@ -144,6 +166,54 @@ static bool domain_is_valid(int domid)
  	return ret;
  }
  
@@ -74,6 +74,7 @@
 +		free(namepath);
 +		return -1;
 +	}
++	namepath = s;
 +	strcat(namepath, "/name");
 +	data = xs_read(xs, XBT_NULL, namepath, &len);
 +	if (!data)
@@ -98,7 +99,7 @@
  static int domain_create_tty(struct domain *dom)
  {
  	char *path;
-@@ -325,6 +394,9 @@ static int domain_create_ring(struct dom
+@@ -325,6 +395,9 @@ static int domain_create_ring(struct dom
  		}
  	}
  
@@ -108,7 +109,7 @@
   out:
  	return err;
  }
-@@ -352,6 +424,7 @@ static bool watch_domain(struct domain *
+@@ -352,6 +425,7 @@ static bool watch_domain(struct domain *
  	return success;
  }
  
@@ -116,7 +117,7 @@
  static struct domain *create_domain(int domid)
  {
  	struct domain *dom;
-@@ -383,6 +456,8 @@ static struct domain *create_domain(int 
+@@ -383,6 +457,8 @@ static struct domain *create_domain(int 
  	strcat(dom->conspath, "/console");
  
  	dom->tty_fd = -1;
@@ -125,7 +126,7 @@
  	dom->is_dead = false;
  	dom->buffer.data = 0;
  	dom->buffer.consumed = 0;
-@@ -444,6 +519,10 @@ static void cleanup_domain(struct domain
+@@ -444,6 +520,10 @@ static void cleanup_domain(struct domain
  		close(d->tty_fd);
  		d->tty_fd = -1;
  	}
@@ -136,7 +137,7 @@
  
  	free(d->buffer.data);
  	d->buffer.data = NULL;
-@@ -605,13 +684,54 @@ static void handle_xs(void)
+@@ -605,13 +685,54 @@ static void handle_xs(void)
  	free(vec);
  }
  
@@ -192,7 +193,7 @@
  		int max_fd = -1;
  
  		FD_ZERO(&readfds);
-@@ -637,7 +757,34 @@ void handle_io(void)
+@@ -637,7 +758,34 @@ void handle_io(void)
  			}
  		}
  
@@ -228,7 +229,7 @@
  
  		if (FD_ISSET(xs_fileno(xs), &readfds))
  			handle_xs();
-@@ -657,7 +804,16 @@ void handle_io(void)
+@@ -657,7 +805,16 @@ void handle_io(void)
  			if (d->is_dead)
  				cleanup_domain(d);
  		}
@@ -246,7 +247,6 @@
  }
  
  /*
-Only in xen-3.1.0-src.new/tools/console/daemon: io.c~
 diff -rup xen-3.1.0-src/tools/console/daemon/main.c xen-3.1.0-src.new/tools/console/daemon/main.c
 --- xen-3.1.0-src/tools/console/daemon/main.c	2007-05-18 10:45:21.000000000 -0400
 +++ xen-3.1.0-src.new/tools/console/daemon/main.c	2007-06-12 09:32:51.000000000 -0400
@@ -364,7 +364,6 @@
 + *  tab-width: 8
 + * End:
 + */
-Only in xen-3.1.0-src.new/tools/console/daemon: main.c~
 diff -rup xen-3.1.0-src/tools/console/daemon/utils.c xen-3.1.0-src.new/tools/console/daemon/utils.c
 --- xen-3.1.0-src/tools/console/daemon/utils.c	2007-05-18 10:45:21.000000000 -0400
 +++ xen-3.1.0-src.new/tools/console/daemon/utils.c	2007-06-12 09:28:21.000000000 -0400