From mboxrd@z Thu Jan  1 00:00:00 1970
From: Anthony Liguori <aliguori@us.ibm.com>
Subject: [PATCH] Remove some dead code from xenconsole
Date: Mon, 03 Apr 2006 11:11:20 -0500
Message-ID: <44314928.9060409@us.ibm.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------010004020908070906040306"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

This is a multi-part message in MIME format.
--------------010004020908070906040306
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Remove some bit rot from the changes to the console driver over the 3.0 
series.  Only compile tested.

Regards,

Anthony Liguori

--------------010004020908070906040306
Content-Type: text/plain;
 name="xenconsole-dead-code.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="xenconsole-dead-code.diff"

# HG changeset patch
# User Anthony Liguori <anthony@codemonkey.ws>
# Node ID e3e364456cac763c144468591df0528536b8cff4
# Parent  4ad317429111d43cc99810af25b3faf6ffed4209
Remove some dead code from the consoled client.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff -r 4ad317429111 -r e3e364456cac tools/console/client/main.c
--- a/tools/console/client/main.c	Sun Apr  2 16:16:53 2006 +0100
+++ b/tools/console/client/main.c	Mon Apr  3 11:06:59 2006 -0500
@@ -36,7 +36,6 @@
 #include <errno.h>
 #include <pty.h>
 
-#include "xenctrl.h"
 #include "xs.h"
 
 #define ESCAPE_CHARACTER 0x1d
@@ -92,7 +91,7 @@
 	tcsetattr(fd, TCSAFLUSH, old);
 }
 
-static int console_loop(int xc_handle, domid_t domid, int fd)
+static int console_loop(int fd)
 {
 	int ret;
 
@@ -161,7 +160,6 @@
 {
 	struct termios attr;
 	int domid;
-	int xc_handle;
 	char *sopt = "h";
 	int ch;
 	int opt_ind=0;
@@ -206,11 +204,6 @@
 		err(errno, "Could not contact XenStore");
 	}
 
-	xc_handle = xc_interface_open();
-	if (xc_handle == -1) {
-		err(errno, "xc_interface_open()");
-	}
-	
 	signal(SIGTERM, sighandler);
 
 	path = xs_get_domain_path(xs, domid);
@@ -260,7 +253,7 @@
 	free(path);
 
 	init_term(STDIN_FILENO, &attr);
-	console_loop(xc_handle, domid, spty);
+	console_loop(spty);
 	restore_term(STDIN_FILENO, &attr);
 
 	return 0;

--------------010004020908070906040306
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

--------------010004020908070906040306--