Remove xen VFB.

Due to XEN bug it prevents Linux boot. Remove it at least, until workaround is found.
ikozhukhov · Dec 18, 2013 · 72c9a50 · 72c9a50
1 parent 8445567
commit 72c9a50
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 929 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2013-12-18  Vladimir Serbinenko  <[email protected]>
+
+	Remove xen VFB.
+
+	Due to XEN bug it prevents Linux boot. Remove it at least, until
+	workaround is found.
+
 2013-12-18  Vladimir Serbinenko  <[email protected]>
 
 	* po/exclude.pot: Add 2 missing excludes.

diff --git a/configure.ac b/configure.ac
@@ -1315,8 +1315,8 @@ if test x"$grub_build_mkfont_excuse" = x ; then
 else
   enable_build_grub_mkfont=no
 fi
-if test x"$enable_build_grub_mkfont" = xno && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 || test "x$platform" = xxen || test "x$platform" = xcoreboot ); then
-  AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot, xen and loongson ports needs build-time grub-mkfont])
+if test x"$enable_build_grub_mkfont" = xno && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 || test "x$platform" = xcoreboot ); then
+  AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot and loongson ports needs build-time grub-mkfont])
 fi
 
 AC_SUBST([build_freetype_cflags])
@@ -1384,8 +1384,8 @@ if test x"$enable_build_grub_mkfont" = xno ; then
   FONT_SOURCE=
 fi
 
-if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 || test "x$platform" = xxen || test "x$platform" = xcoreboot ); then
-   AC_MSG_ERROR([qemu, powerpc-ieee1275, xen, coreboot and loongson ports need unifont])
+if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 || test "x$platform" = xcoreboot ); then
+   AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot and loongson ports need unifont])
 fi
 
 AC_SUBST([FONT_SOURCE])

diff --git a/gentpl.py b/gentpl.py
@@ -64,7 +64,7 @@
 GROUPS["usb"]      = GROUPS["pci"]
 
 # If gfxterm is main output console integrate it into kernel
-GROUPS["videoinkernel"] = ["mips_loongson", "i386_coreboot" ] + GROUPS["xen"]
+GROUPS["videoinkernel"] = ["mips_loongson", "i386_coreboot" ]
 GROUPS["videomodules"]   = GRUB_PLATFORMS[:];
 for i in GROUPS["videoinkernel"]: GROUPS["videomodules"].remove(i)
 

diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
@@ -135,12 +135,6 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/keyboard_layouts.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
 endif
 
 if COND_x86_64_xen
@@ -150,12 +144,6 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/keyboard_layouts.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
 endif
 
 if COND_x86_64_efi

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
@@ -192,9 +192,6 @@ kernel = {
   xen = term/xen/console.c;
   xen = disk/xen/xendisk.c;
   xen = commands/boot.c;
-  xen = commands/keylayouts.c;
-  xen = video/xen/xenfb.c;
-  xen = term/xen/xen_kbd.c;
 
   ia64_efi = kern/ia64/efi/startup.S;
   ia64_efi = kern/ia64/efi/init.c;

diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c
@@ -27,8 +27,6 @@
 #include <grub/i386/tsc.h>
 #include <grub/term.h>
 #include <grub/loader.h>
-#include <grub/keyboard_layouts.h>
-#include <grub/video.h>
 
 grub_addr_t grub_modbase;
 struct start_info *grub_xen_start_page_addr;
@@ -69,7 +67,6 @@ grub_xen_alloc_shared_page (domid_t dom, grub_xen_grant_t * grnum)
   ret = grub_memalign (GRUB_XEN_PAGE_SIZE, GRUB_XEN_PAGE_SIZE);
   if (!ret)
     return NULL;
-  grub_memset (ret, 0, GRUB_XEN_PAGE_SIZE);
   mfn = grub_xen_ptr2mfn (ret);
   entry->frame = mfn;
   entry->domid = dom;
@@ -256,8 +253,6 @@ grub_xenstore_write_file (const char *dir, const void *buf, grub_size_t len)
   grub_size_t dirlen = grub_strlen (dir) + 1;
   char *resp;
 
-  grub_dprintf ("xen", "writing `%s'\n", dir);
-
   grub_memset (&msg, 0, sizeof (msg));
   msg.type = XS_WRITE;
   msg.len = dirlen + len;
@@ -544,13 +539,6 @@ grub_machine_init (void)
 
   map_all_pages ();
 
-  grub_video_xen_init ();
-  grub_font_init ();
-  grub_gfxterm_init ();
-
-  grub_keylayouts_init ();
-  grub_xen_keyboard_init ();
-
   grub_console_init ();
 
   grub_tsc_init ();
@@ -574,8 +562,6 @@ void
 grub_machine_fini (int flags __attribute__ ((unused)))
 {
   grub_xendisk_fini ();
-  grub_video_xen_fini ();
-  grub_xen_keyboard_fini ();
   grub_boot_fini ();
 }
 

diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
@@ -222,8 +222,6 @@ grub_xen_boot (void)
   grub_xen_mfn_t *new_mfn_list;
   grub_size_t i;
 
-  grub_video_restore ();
-
   if (grub_xen_n_allocated_shared_pages)
     return grub_error (GRUB_ERR_BUG, "active grants");
 

diff --git a/grub-core/term/xen/console.c b/grub-core/term/xen/console.c
@@ -114,8 +114,8 @@ static struct grub_term_output grub_console_term_output = {
 void
 grub_console_init (void)
 {
-  grub_term_register_input_active ("console", &grub_console_term_input);
-  grub_term_register_output_active ("console", &grub_console_term_output);
+  grub_term_register_input ("console", &grub_console_term_input);
+  grub_term_register_output ("console", &grub_console_term_output);
 
   grub_terminfo_init ();
   grub_terminfo_output_register (&grub_console_term_output, "vt100-color");