Don't try to detect cbfs on *-emu.

diff --git a/ChangeLog b/ChangeLog
index 89020ed6e4588e3d09bc8b8f8334e806f8eb97df..8208b09d7b822940bf3999318125829e6831b7ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-16  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Don't try to detect cbfs on *-emu.
+
 2013-06-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/term/gfxterm.c: USe right background color when scrolling.

diff --git a/grub-core/fs/cbfs.c b/grub-core/fs/cbfs.c
index d1631f1521a1946c8492c39a60b3b9def2d8533e..e298db36281f6a583fa02d3a2cfa8df5fa9e9bb4 100644 (file)
--- a/grub-core/fs/cbfs.c
+++ b/grub-core/fs/cbfs.c
@@ -260,7 +260,7 @@ grub_cbfs_close (grub_file_t file)
   return grub_errno;
 }
 
-#if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL)
+#if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)
 
 static char *cbfsdisk_addr;
 static grub_off_t cbfsdisk_size = 0;
@@ -367,7 +367,7 @@ static struct grub_fs grub_cbfs_fs = {
 
 GRUB_MOD_INIT (cbfs)
 {
-#if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL)
+#if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)
   init_cbfsdisk ();
 #endif
   grub_fs_register (&grub_cbfs_fs);
@@ -376,7 +376,7 @@ GRUB_MOD_INIT (cbfs)
 GRUB_MOD_FINI (cbfs)
 {
   grub_fs_unregister (&grub_cbfs_fs);
-#if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL)
+#if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)
   fini_cbfsdisk ();
 #endif
 }