Add *-xen to the list of grub-install-common platforms.

diff --git a/ChangeLog b/ChangeLog
index 7b215ac9c2829e04c0660b280a41e39b61593b62..e5e7eb20bb1fff99a6f4191fa858bbf8b8347d38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Add *-xen to the list of grub-install-common platforms.
+
 2013-11-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * configure.ac: Do not enforce -mcmodel=large. It's not necessarry with

diff --git a/include/grub/util/install.h b/include/grub/util/install.h
index c1cd6b33969cf1c86293229d807adc4f79d40a9c..1b1ccd027b72efeea9054926fb4843466fb1221b 100644 (file)
--- a/include/grub/util/install.h
+++ b/include/grub/util/install.h
@@ -87,6 +87,8 @@ enum grub_install_plat
     GRUB_INSTALL_PLATFORM_ARM_EFI,
     GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS,
     GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS,
+    GRUB_INSTALL_PLATFORM_I386_XEN,
+    GRUB_INSTALL_PLATFORM_X86_64_XEN,
     GRUB_INSTALL_PLATFORM_MAX
   };
 

diff --git a/util/grub-install-common.c b/util/grub-install-common.c
index 4e1d41ae6315126cf376d7d262c3dea5d34fab01..dac91e0be35376932c980178d0f8dd0a7f7f824a 100644 (file)
--- a/util/grub-install-common.c
+++ b/util/grub-install-common.c
@@ -597,6 +597,8 @@ static struct
     [GRUB_INSTALL_PLATFORM_I386_MULTIBOOT] =   { "i386",    "multiboot" },
     [GRUB_INSTALL_PLATFORM_I386_IEEE1275] =    { "i386",    "ieee1275"  },
     [GRUB_INSTALL_PLATFORM_X86_64_EFI] =       { "x86_64",  "efi"       },
+    [GRUB_INSTALL_PLATFORM_I386_XEN] =         { "i386",    "xen"       },
+    [GRUB_INSTALL_PLATFORM_X86_64_XEN] =       { "x86_64",  "xen"       },
     [GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON] =  { "mipsel",  "loongson"  },
     [GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS] = { "mipsel",  "qemu_mips" },
     [GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS] =   { "mips",    "qemu_mips" },

diff --git a/util/grub-install.c b/util/grub-install.c
index 78e9a0458b32e011b3efbbf457825f1254527201..482317abd96ec96ad5f768f3a795396ab08559a2 100644 (file)
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -415,6 +415,9 @@ have_bootdev (enum grub_install_plat pl)
 
     case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON:
     case GRUB_INSTALL_PLATFORM_ARM_UBOOT:
+
+    case GRUB_INSTALL_PLATFORM_I386_XEN:
+    case GRUB_INSTALL_PLATFORM_X86_64_XEN:
       return 0;
 
       /* pacify warning.  */
@@ -754,6 +757,8 @@ main (int argc, char *argv[])
     case GRUB_INSTALL_PLATFORM_MIPSEL_ARC:
     case GRUB_INSTALL_PLATFORM_MIPS_ARC:
     case GRUB_INSTALL_PLATFORM_ARM_UBOOT:
+    case GRUB_INSTALL_PLATFORM_I386_XEN:
+    case GRUB_INSTALL_PLATFORM_X86_64_XEN:
       break;
 
     case GRUB_INSTALL_PLATFORM_I386_QEMU:
@@ -793,6 +798,8 @@ main (int argc, char *argv[])
     case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON:
     case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:
     case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS:
+    case GRUB_INSTALL_PLATFORM_I386_XEN:
+    case GRUB_INSTALL_PLATFORM_X86_64_XEN:
       free (install_device);
       install_device = NULL;
       break;
@@ -1204,6 +1211,8 @@ main (int argc, char *argv[])
                  case GRUB_INSTALL_PLATFORM_MIPS_ARC:
                  case GRUB_INSTALL_PLATFORM_MIPSEL_ARC:
                  case GRUB_INSTALL_PLATFORM_ARM_UBOOT:
+                 case GRUB_INSTALL_PLATFORM_I386_XEN:
+                 case GRUB_INSTALL_PLATFORM_X86_64_XEN:
                    grub_util_warn ("%s", _("no hints available for your platform. Expect reduced performance"));
                    break;
                    /* pacify warning.  */
@@ -1290,6 +1299,8 @@ main (int argc, char *argv[])
     case GRUB_INSTALL_PLATFORM_I386_MULTIBOOT:
     case GRUB_INSTALL_PLATFORM_I386_IEEE1275:
     case GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275:
+    case GRUB_INSTALL_PLATFORM_I386_XEN:
+    case GRUB_INSTALL_PLATFORM_X86_64_XEN:
       core_name = "core.elf";
       snprintf (mkimage_target, sizeof (mkimage_target),
                "%s-%s",
@@ -1380,6 +1391,8 @@ main (int argc, char *argv[])
     case GRUB_INSTALL_PLATFORM_ARM_UBOOT:
     case GRUB_INSTALL_PLATFORM_I386_QEMU:
     case GRUB_INSTALL_PLATFORM_SPARC64_IEEE1275:
+    case GRUB_INSTALL_PLATFORM_I386_XEN:
+    case GRUB_INSTALL_PLATFORM_X86_64_XEN:
       break;
       /* pacify warning.  */
     case GRUB_INSTALL_PLATFORM_MAX:
@@ -1536,6 +1549,8 @@ main (int argc, char *argv[])
     case GRUB_INSTALL_PLATFORM_MIPSEL_ARC:
     case GRUB_INSTALL_PLATFORM_ARM_UBOOT:
     case GRUB_INSTALL_PLATFORM_I386_QEMU:
+    case GRUB_INSTALL_PLATFORM_I386_XEN:
+    case GRUB_INSTALL_PLATFORM_X86_64_XEN:
       grub_util_warn ("%s",
                      _("WARNING: no platform-specific install was performed"));
       break;