[kernel] r12329 - in people/waldi/xen-extra/linux-2.6.18-xen-3/debian: . patches-update/features/all/xen patches-update/series

[Bastian Blank]

Author: waldi
Date: Fri Oct 17 14:03:53 2008
New Revision: 12329

Log:
* debian/changelog: Update.
* debian/patches-update/features/all/xen/console-hvc-overtake.patch: Add.
* debian/patches-update/series/1-extra: Add new patch.


Added:
   people/waldi/xen-extra/linux-2.6.18-xen-3/debian/patches-update/features/all/xen/console-hvc-overtake.patch
Modified:
   people/waldi/xen-extra/linux-2.6.18-xen-3/debian/changelog
   people/waldi/xen-extra/linux-2.6.18-xen-3/debian/patches-update/series/1-extra

Modified: people/waldi/xen-extra/linux-2.6.18-xen-3/debian/changelog
==============================================================================
--- people/waldi/xen-extra/linux-2.6.18-xen-3/debian/changelog	(original)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3/debian/changelog	Fri Oct 17 14:03:53 2008
@@ -1,6 +1,7 @@
 linux-2.6.18-xen-3 (2.6.18.dfsg.1-23+xen.1) kernel-waldi-xen-extra; urgency=low
 
   * Update Xen patch to 3.1 branch, 3.1.1 release.
+  * Allow overtaking of hvc for the console.
 
  -- Bastian Blank <waldi at debian.org>  Fri, 17 Oct 2008 15:12:44 +0200
 

Added: people/waldi/xen-extra/linux-2.6.18-xen-3/debian/patches-update/features/all/xen/console-hvc-overtake.patch
==============================================================================
--- (empty file)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3/debian/patches-update/features/all/xen/console-hvc-overtake.patch	Fri Oct 17 14:03:53 2008
@@ -0,0 +1,69 @@
+diff --git a/drivers/xen/console/console.c b/drivers/xen/console/console.c
+index e4e5d41..03f8ce9 100644
+--- a/drivers/xen/console/console.c
++++ b/drivers/xen/console/console.c
+@@ -66,20 +66,25 @@
+  *  'xencons=tty'  [XC_TTY]:     Console attached to '/dev/tty[0-9]+'.
+  *  'xencons=ttyS' [XC_SERIAL]:  Console attached to '/dev/ttyS[0-9]+'.
+  *  'xencons=xvc'  [XC_XVC]:     Console attached to '/dev/xvc0'.
++ *  'xencons=hvc'  [XC_HVC]:     Console attached to '/dev/hvc0'.
+  *  default:                     DOM0 -> XC_SERIAL ; all others -> XC_TTY.
+  * 
+  * NB. In mode XC_TTY, we create dummy consoles for tty2-63. This suppresses
+  * warnings from standard distro startup scripts.
+  */
+ static enum {
+-	XC_OFF, XC_TTY, XC_SERIAL, XC_XVC
++	XC_OFF, XC_TTY, XC_SERIAL, XC_XVC, XC_HVC
+ } xc_mode;
+ static int xc_num = -1;
+ 
+ /* /dev/xvc0 device number allocated by lanana.org. */
+ #define XEN_XVC_MAJOR 204
+ #define XEN_XVC_MINOR 191
+ 
++/* /dev/hvc0 device number */
++#define XEN_HVC_MAJOR 229
++#define XEN_HVC_MINOR 0
++
+ #ifdef CONFIG_MAGIC_SYSRQ
+ static unsigned long sysrq_requested;
+ extern int sysrq_enabled;
+@@ -97,6 +102,9 @@ static int __init xencons_setup(char *str)
+ 	} else if (!strncmp(str, "xvc", 3)) {
+ 		xc_mode = XC_XVC;
+ 		str += 3;
++	} else if (!strncmp(str, "hvc", 3)) {
++		xc_mode = XC_HVC;
++		str += 3;
+ 	} else if (!strncmp(str, "off", 3)) {
+ 		xc_mode = XC_OFF;
+ 		str += 3;
+@@ -205,6 +213,14 @@ static int __init xen_console_init(void)
+ 			xc_num = 0;
+ 		break;
+ 
++	case XC_HVC:
++		strcpy(kcons_info.name, "hvc");
++		if (xc_num == -1)
++			xc_num = 0;
++		if (!is_initial_xendomain())
++			add_preferred_console(kcons_info.name, xc_num, NULL);
++		break;
++
+ 	case XC_SERIAL:
+ 		strcpy(kcons_info.name, "ttyS");
+ 		if (xc_num == -1)
+@@ -681,6 +697,12 @@ static int __init xencons_init(void)
+ 		DRV(xencons_driver)->minor_start = XEN_XVC_MINOR;
+ 		DRV(xencons_driver)->name_base   = xc_num;
+ 		break;
++	case XC_HVC:
++		DRV(xencons_driver)->name        = "hvc";
++		DRV(xencons_driver)->major       = XEN_HVC_MAJOR;
++		DRV(xencons_driver)->minor_start = XEN_HVC_MINOR;
++		DRV(xencons_driver)->name_base   = xc_num;
++		break;
+ 	case XC_SERIAL:
+ 		DRV(xencons_driver)->name        = "ttyS";
+ 		DRV(xencons_driver)->minor_start = 64 + xc_num;

Modified: people/waldi/xen-extra/linux-2.6.18-xen-3/debian/patches-update/series/1-extra
==============================================================================
--- people/waldi/xen-extra/linux-2.6.18-xen-3/debian/patches-update/series/1-extra	(original)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3/debian/patches-update/series/1-extra	Fri Oct 17 14:03:53 2008
@@ -5,5 +5,6 @@
 + ../patches-base/features/all/vserver/bindmount-dev.patch *_xen-vserver
 + features/all/xen/vserver-clash.patch *_xen-vserver
 + features/all/xen/xen-3.1-15467.patch *_xen *_xen-vserver
++ features/all/xen/console-hvc-overtake.patch *_xen *_xen-vserver
 + features/all/xen/xen-4gb-fixup.patch *_xen *_xen-vserver
 + features/all/xen/vserver-update.patch *_xen-vserver