rpms/kernel-xen-2.6/F-8 linux-2.6-xen-paravirt-nographics-pvfb-fix.patch, NONE, 1.1 kernel-xen.spec, 1.65, 1.66

[Eduardo Habkost (ehabkost)]

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26467

Modified Files:
	kernel-xen.spec 
Added Files:
	linux-2.6-xen-paravirt-nographics-pvfb-fix.patch 
Log Message:
Fix for 'virt-install --nographics --paravirt' (bug #348931)

>From Markus Armbruster.



linux-2.6-xen-paravirt-nographics-pvfb-fix.patch:

--- NEW FILE linux-2.6-xen-paravirt-nographics-pvfb-fix.patch ---
From: Markus Armbruster <armbru at redhat.com>
Date: Tue, 23 Oct 2007 17:11:05 +0200
Subject: Patch back lost hack to get a working console when PVFB is off

Eduardo,

Dan pointed me to the fact that virt-install --nographics --paravirt
doesn't work in F-7 and Rawhide.  I checked, and found that we lost
our hack to make sure console output goes somewhere sane when PVFB is
off.  The appended patch applies both to kernel-xen-2.6/F-7 and devel.
I built a devel kernel, and it fixes virt-install.

Want me to push it through brew before you take it?



--- a/drivers/xen/console/console.c	2007-10-23 15:42:30.000000000 +0200
+++ b/drivers/xen/console/console.c	2007-10-23 16:05:12.000000000 +0200
@@ -86,10 +86,7 @@
 
 void xencons_early_setup(void)
 {
-	if (is_initial_xendomain())
-		xc_mode = XC_SERIAL;
-	else
-		xc_mode = XC_XVC;
+	xc_mode = XC_XVC;
 }
 
 static int __init xencons_setup(char *str)
@@ -704,6 +701,15 @@
 	printk("Xen virtual console successfully installed as %s%d\n",
 	       DRV(xencons_driver)->name, xc_num);
 
+        /* Check about framebuffer messing up the console */
+        if (!is_initial_xendomain() &&
+	    !xenbus_exists(XBT_NIL, "device", "vfb")) {
+		/* FIXME: this is ugly */
+		unregister_console(&kcons_info);
+		kcons_info.flags |= CON_CONSDEV;
+		register_console(&kcons_info);
+	}
+
 	return 0;
 }
 





Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-8/kernel-xen.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- kernel-xen.spec	10 Oct 2007 15:27:48 -0000	1.65
+++ kernel-xen.spec	23 Oct 2007 15:52:05 -0000	1.66
@@ -476,6 +476,9 @@
 # Remove bogus WARN_ON() from synchronize_irq() (bug #293451)
 Patch966: linux-2.6-xen-fix-irq-warn-mismerge.patch
 
+# paravirt virt-install --nographics fix (bug #348931)
+Patch967: linux-2.6-xen-paravirt-nographics-pvfb-fix.patch
+
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
 #
@@ -968,6 +971,7 @@
 %patch964 -p1
 %patch965 -p1
 %patch966 -p1
+%patch967 -p1
 %endif
 
 
@@ -2374,6 +2378,9 @@
 #  - tux.
 
 %changelog
+* Tue Oct 23 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Fix for 'virt-install --nographics --paravirt' (bug #348931)
+
 * Wed Oct 10 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Remove bogus WARN_ON() from synchronize_irq() (bug #293451)