X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2Fguestfs-internal.h;h=9c7c96cc714a38e94f67fb9a75967543e5dc89a8;hp=c8db8291922f6ab2a27a7ad9b442e21ed7d62b18;hb=428a45c3e15f03e9861e1b551e1ae8da821dba5f;hpb=a2d4a8bf073c3551d174bd6c406e0cf3d27fb560

diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h
index c8db829..9c7c96c 100644
--- a/src/guestfs-internal.h
+++ b/src/guestfs-internal.h
@@ -38,11 +38,10 @@
 #define N_(str) str
 #endif
 
-#ifdef __linux__
-#define CAN_CHECK_PEER_EUID 1
-#else
-#define CAN_CHECK_PEER_EUID 0
-#endif
+#define TMP_TEMPLATE_ON_STACK(var)                        \
+  const char *ttos_tmpdir = guestfs_tmpdir ();            \
+  char var[strlen (ttos_tmpdir) + 32];                    \
+  sprintf (var, "%s/libguestfsXXXXXX", ttos_tmpdir)       \
 
 #define UNIX_PATH_MAX 108
 
@@ -74,8 +73,6 @@
  */
 #define NETWORK "169.254.0.0/16"
 #define ROUTER "169.254.2.2"
-#define GUESTFWD_ADDR "169.254.2.4"
-#define GUESTFWD_PORT "6666"
 
 /* GuestFS handle and connection. */
 enum state { CONFIG, LAUNCHING, READY, BUSY, NO_HANDLE };
@@ -106,6 +103,7 @@ struct guestfs_h
   int autosync;
   int direct;
   int recovery_proc;
+  int enable_network;
 
   char *path;			/* Path to kernel, initrd. */
   char *qemu;			/* Qemu binary. */
@@ -116,6 +114,7 @@ struct guestfs_h
   int selinux;                  /* selinux enabled? */
 
   char *last_error;
+  int last_errnum;              /* errno, or 0 if there was no errno */
 
   /* Callbacks. */
   guestfs_abort_cb           abort_cb;
@@ -129,6 +128,8 @@ struct guestfs_h
   void *                     launch_done_cb_data;
   guestfs_close_cb           close_cb;
   void *                     close_cb_data;
+  guestfs_progress_cb        progress_cb;
+  void *                     progress_cb_data;
 
   int msg_next_serial;
 
@@ -137,6 +138,9 @@ struct guestfs_h
    */
   struct inspect_fs *fses;
   size_t nr_fses;
+
+  /* Private data area. */
+  struct hash_table *pda;
 };
 
 /* Per-filesystem data stored for inspect_os. */
@@ -163,6 +167,11 @@ enum inspect_os_distro {
   OS_DISTRO_REDHAT_BASED,
   OS_DISTRO_RHEL,
   OS_DISTRO_WINDOWS,
+  OS_DISTRO_PARDUS,
+  OS_DISTRO_ARCHLINUX,
+  OS_DISTRO_GENTOO,
+  OS_DISTRO_UBUNTU,
+  OS_DISTRO_MEEGO,
 };
 
 struct inspect_fs {
@@ -177,6 +186,7 @@ struct inspect_fs {
   int major_version;
   int minor_version;
   char *arch;
+  char *windows_systemroot;
   struct inspect_fstab_entry *fstab;
   size_t nr_fstab;
 };
@@ -191,13 +201,16 @@ struct guestfs_message_error;
 
 extern void guestfs_error (guestfs_h *g, const char *fs, ...)
   __attribute__((format (printf,2,3)));
+extern void guestfs_error_errno (guestfs_h *g, int errnum, const char *fs, ...)
+  __attribute__((format (printf,3,4)));
 extern void guestfs_perrorf (guestfs_h *g, const char *fs, ...)
   __attribute__((format (printf,2,3)));
 extern void *guestfs_safe_realloc (guestfs_h *g, void *ptr, int nbytes);
 extern char *guestfs_safe_strdup (guestfs_h *g, const char *str);
 extern char *guestfs_safe_strndup (guestfs_h *g, const char *str, size_t n);
 extern void *guestfs_safe_memdup (guestfs_h *g, void *ptr, size_t size);
-extern const char *guestfs___tmpdir (void);
+extern void guestfs___print_timestamped_argv (guestfs_h *g, const char *argv[]);
+extern void guestfs___print_timestamped_message (guestfs_h *g, const char *fs, ...);
 extern void guestfs___free_inspect_info (guestfs_h *g);
 extern int guestfs___set_busy (guestfs_h *g);
 extern int guestfs___end_busy (guestfs_h *g);
@@ -208,9 +221,12 @@ extern int guestfs___recv_file (guestfs_h *g, const char *filename);
 extern int guestfs___send_to_daemon (guestfs_h *g, const void *v_buf, size_t n);
 extern int guestfs___recv_from_daemon (guestfs_h *g, uint32_t *size_rtn, void **buf_rtn);
 extern int guestfs___accept_from_daemon (guestfs_h *g);
+extern int guestfs___build_appliance (guestfs_h *g, char **kernel, char **initrd, char **appliance);
+extern void guestfs___print_BufferIn (FILE *out, const char *buf, size_t buf_size);
 
-#define error guestfs_error
+#define error(g,...) guestfs_error_errno((g),0,__VA_ARGS__)
 #define perrorf guestfs_perrorf
+#define safe_calloc guestfs_safe_calloc
 #define safe_malloc guestfs_safe_malloc
 #define safe_realloc guestfs_safe_realloc
 #define safe_strdup guestfs_safe_strdup