summaryrefslogtreecommitdiffstats
path: root/src/inspect.c
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-08-28 18:54:27 +0100
committerRichard W.M. Jones <rjones@redhat.com>2012-08-29 17:08:01 +0100
commitb2378a81bb7acb94409469e8b19d0c717811a99d (patch)
tree5bc2c545a9347add1bd9e6b17dd1ae35e35fc7d4 /src/inspect.c
parent288cc74d77fd80e40a442344d9d0ce00162c1fb4 (diff)
downloadlibguestfs-b2378a81bb7acb94409469e8b19d0c717811a99d.tar.gz
libguestfs-b2378a81bb7acb94409469e8b19d0c717811a99d.tar.xz
libguestfs-b2378a81bb7acb94409469e8b19d0c717811a99d.zip
Update inspection and example programs to use new hivex* APIs (RHBZ#852394).
I tested this by comparing the output of virt-inspector over Windows guests before and after the change, which was identical: $ md5sum `ls -1 /tmp/*.before /tmp/*.after` c292d6629b5a761eccb4a279754399b4 /tmp/Win2003.after c292d6629b5a761eccb4a279754399b4 /tmp/Win2003.before eb1e1ff29208a9ee46e9c100dfec26b2 /tmp/Win2012.after eb1e1ff29208a9ee46e9c100dfec26b2 /tmp/Win2012.before d060a95d7ffe5dce6c4e66feb80c2837 /tmp/Win7x32.after d060a95d7ffe5dce6c4e66feb80c2837 /tmp/Win7x32.before 8914eee70ac4f8a0317659e09e00dcdc /tmp/Win7x32Dynamic.after 8914eee70ac4f8a0317659e09e00dcdc /tmp/Win7x32Dynamic.before a2dcdfc0f9d64054640875aa791889e0 /tmp/Win7x32TwoDisks.after a2dcdfc0f9d64054640875aa791889e0 /tmp/Win7x32TwoDisks.before 5ed49568a5147dce7517c99de41ebf2e /tmp/Win8previewx64.after 5ed49568a5147dce7517c99de41ebf2e /tmp/Win8previewx64.before fdfc7d272b79a665ae3313ae1ae30660 /tmp/WinXP.after fdfc7d272b79a665ae3313ae1ae30660 /tmp/WinXP.before 3c705444be664f1316b21c5d8d3cb0be /tmp/WinXPRecConsole.after 3c705444be664f1316b21c5d8d3cb0be /tmp/WinXPRecConsole.before
Diffstat (limited to 'src/inspect.c')
-rw-r--r--src/inspect.c143
1 files changed, 0 insertions, 143 deletions
diff --git a/src/inspect.c b/src/inspect.c
index 44826c3d..8cba6b19 100644
--- a/src/inspect.c
+++ b/src/inspect.c
@@ -34,10 +34,6 @@
#include <pcre.h>
-#ifdef HAVE_HIVEX
-#include <hivex.h>
-#endif
-
#include "c-ctype.h"
#include "ignore-value.h"
#include "xstrtol.h"
@@ -47,8 +43,6 @@
#include "guestfs-internal-actions.h"
#include "guestfs_protocol.h"
-#if defined(HAVE_HIVEX)
-
/* The main inspection code. */
char **
guestfs__inspect_os (guestfs_h *g)
@@ -540,143 +534,6 @@ guestfs__inspect_get_hostname (guestfs_h *g, const char *root)
return safe_strdup (g, fs->hostname ? : "unknown");
}
-#else /* no hivex at compile time */
-
-/* XXX These functions should be in an optgroup. */
-
-#define NOT_IMPL(r) \
- guestfs_error_errno (g, ENOTSUP, _("inspection API not available since this version of libguestfs was compiled without the hivex library")); \
- return r
-
-char **
-guestfs__inspect_os (guestfs_h *g)
-{
- NOT_IMPL(NULL);
-}
-
-char **
-guestfs__inspect_get_roots (guestfs_h *g)
-{
- NOT_IMPL(NULL);
-}
-
-char *
-guestfs__inspect_get_type (guestfs_h *g, const char *root)
-{
- NOT_IMPL(NULL);
-}
-
-char *
-guestfs__inspect_get_arch (guestfs_h *g, const char *root)
-{
- NOT_IMPL(NULL);
-}
-
-char *
-guestfs__inspect_get_distro (guestfs_h *g, const char *root)
-{
- NOT_IMPL(NULL);
-}
-
-int
-guestfs__inspect_get_major_version (guestfs_h *g, const char *root)
-{
- NOT_IMPL(-1);
-}
-
-int
-guestfs__inspect_get_minor_version (guestfs_h *g, const char *root)
-{
- NOT_IMPL(-1);
-}
-
-char *
-guestfs__inspect_get_product_name (guestfs_h *g, const char *root)
-{
- NOT_IMPL(NULL);
-}
-
-char *
-guestfs__inspect_get_product_variant (guestfs_h *g, const char *root)
-{
- NOT_IMPL(NULL);
-}
-
-char *
-guestfs__inspect_get_windows_systemroot (guestfs_h *g, const char *root)
-{
- NOT_IMPL(NULL);
-}
-
-char *
-guestfs__inspect_get_windows_current_control_set (guestfs_h *g,
- const char *root)
-{
- NOT_IMPL(NULL);
-}
-
-char **
-guestfs__inspect_get_mountpoints (guestfs_h *g, const char *root)
-{
- NOT_IMPL(NULL);
-}
-
-char **
-guestfs__inspect_get_filesystems (guestfs_h *g, const char *root)
-{
- NOT_IMPL(NULL);
-}
-
-char **
-guestfs__inspect_get_drive_mappings (guestfs_h *g, const char *root)
-{
- NOT_IMPL(NULL);
-}
-
-char *
-guestfs__inspect_get_package_format (guestfs_h *g, const char *root)
-{
- NOT_IMPL(NULL);
-}
-
-char *
-guestfs__inspect_get_package_management (guestfs_h *g, const char *root)
-{
- NOT_IMPL(NULL);
-}
-
-char *
-guestfs__inspect_get_hostname (guestfs_h *g, const char *root)
-{
- NOT_IMPL(NULL);
-}
-
-char *
-guestfs__inspect_get_format (guestfs_h *g, const char *root)
-{
- NOT_IMPL(NULL);
-}
-
-int
-guestfs__inspect_is_live (guestfs_h *g, const char *root)
-{
- NOT_IMPL(-1);
-}
-
-int
-guestfs__inspect_is_netinst (guestfs_h *g, const char *root)
-{
- NOT_IMPL(-1);
-}
-
-int
-guestfs__inspect_is_multipart (guestfs_h *g, const char *root)
-{
- NOT_IMPL(-1);
-}
-
-#endif /* no hivex at compile time */
-
void
guestfs___free_inspect_info (guestfs_h *g)
{