2010-08-03 Robert Millan <rmh@gnu.org>

	Fix grub-emu build.

	* include/grub/util/misc.h: Move `<grub/util/libzfs.h>' to ...
	* include/grub/emu/misc.h: ... here.

	* include/grub/util/misc.h (grub_get_libzfs_handle): Move function ...
	* include/grub/emu/misc.h (grub_get_libzfs_handle): ... here.

	* util/misc.c: Remove `<grub/util/libzfs.h>'.
	[HAVE_LIBZFS] (libzfs_handle, fini_libzfs)
	(grub_get_libzfs_handle): Move to ...
	* kern/emu/misc.c [HAVE_LIBZFS] (__libzfs_handle, fini_libzfs)
	(grub_get_libzfs_handle): ... here.

diff --git a/ChangeLog b/ChangeLog
index d4da9f96ca2037899022811f8cf79d72fa07e105..b3e7bc67f0129fae009cea9088dec643dc58b2e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-03  Robert Millan  <rmh@gnu.org>
+
+       Fix grub-emu build.
+
+       * include/grub/util/misc.h: Move `<grub/util/libzfs.h>' to ...
+       * include/grub/emu/misc.h: ... here.
+
+       * include/grub/util/misc.h (grub_get_libzfs_handle): Move function ...
+       * include/grub/emu/misc.h (grub_get_libzfs_handle): ... here.
+
+       * util/misc.c: Remove `<grub/util/libzfs.h>'.
+       [HAVE_LIBZFS] (libzfs_handle, fini_libzfs)
+       (grub_get_libzfs_handle): Move to ...
+       * kern/emu/misc.c [HAVE_LIBZFS] (__libzfs_handle, fini_libzfs)
+       (grub_get_libzfs_handle): ... here.
+
 2010-08-03  BVK Chaitanya  <bvk.groups@gmail.com>
 
        * script/execute.c (grub_script_execute_cmdline): Check for NULL

diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index 5047a940652112995a63c03c98d5c3608948d54a..70cf05e0dc41e327eb5ac26c02abceba5a85a069 100644 (file)
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -21,6 +21,7 @@
 
 #include <grub/symbol.h>
 #include <grub/types.h>
+#include <grub/util/libzfs.h>
 
 #ifdef __CYGWIN__
 # include <sys/fcntl.h>
@@ -75,4 +76,6 @@ extern char * canonicalize_file_name (const char *path);
 int grub_device_mapper_supported (void);
 #endif
 
+libzfs_handle_t *grub_get_libzfs_handle (void);
+
 #endif /* GRUB_EMU_MISC_H */

diff --git a/include/grub/util/misc.h b/include/grub/util/misc.h
index 7ce3d329196e674e86dc3c8eef27e666c47d18c7..48dfbb8686db9353616a2a92a19e3192d3bdb374 100644 (file)
--- a/include/grub/util/misc.h
+++ b/include/grub/util/misc.h
@@ -29,7 +29,6 @@
 #include <grub/types.h>
 #include <grub/symbol.h>
 #include <grub/emu/misc.h>
-#include <grub/util/libzfs.h>
 
 char *grub_util_get_path (const char *dir, const char *file);
 size_t grub_util_get_fp_size (FILE *fp);
@@ -61,6 +60,4 @@ char *canonicalize_file_name (const char *path);
 
 void grub_util_init_nls (void);
 
-libzfs_handle_t *grub_get_libzfs_handle (void);
-
 #endif /* ! GRUB_UTIL_MISC_HEADER */

diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index 0d71ef3d6d68a1bf91fa860a02913359a8dabea1..0838dc3c09643d6acb9bb6b7c362553ab8ba349f 100644 (file)
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -45,8 +45,11 @@
 # include <libdevmapper.h>
 #endif
 
-#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+#ifdef HAVE_LIBZFS
 # include <grub/util/libzfs.h>
+#endif
+
+#ifdef HAVE_LIBNVPAIR
 # include <grub/util/libnvpair.h>
 #endif
 
@@ -246,6 +249,28 @@ get_win32_path (const char *path)
 }
 #endif
 
+#ifdef HAVE_LIBZFS
+static libzfs_handle_t *__libzfs_handle;
+
+static void
+fini_libzfs (void)
+{
+  libzfs_fini (__libzfs_handle);
+}
+
+libzfs_handle_t *
+grub_get_libzfs_handle (void)
+{
+  if (! __libzfs_handle)
+    {
+      __libzfs_handle = libzfs_init ();
+      atexit (fini_libzfs);
+    }
+
+  return __libzfs_handle;
+}
+#endif /* HAVE_LIBZFS */
+
 #if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
 /* Not ZFS-specific in itself, but for now it's only used by ZFS-related code.  */
 char *

diff --git a/util/misc.c b/util/misc.c
index 274c182c23229467ccd1bb7a6a3a36dc97cce6f9..21dd211e1b4acfb30000b53ce12d7b51ebe17ce0 100644 (file)
--- a/util/misc.c
+++ b/util/misc.c
@@ -36,7 +36,6 @@
 #include <grub/misc.h>
 #include <grub/cache.h>
 #include <grub/util/misc.h>
-#include <grub/util/libzfs.h>
 #include <grub/mm.h>
 #include <grub/term.h>
 #include <grub/time.h>
@@ -295,27 +294,6 @@ grub_util_init_nls (void)
 #endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
 }
 
-#ifdef HAVE_LIBZFS
-static libzfs_handle_t *libzfs_handle;
-
-static void
-fini_libzfs (void)
-{
-  libzfs_fini (libzfs_handle);
-}
-
-libzfs_handle_t *
-grub_get_libzfs_handle (void)
-{
-  if (! libzfs_handle)
-    {
-      libzfs_handle = libzfs_init ();
-      atexit (fini_libzfs);
-    }
-
-  return libzfs_handle;
-}
-#endif /* HAVE_LIBZFS */
 #endif /* GRUB_UTIL */
 
 int