X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2Fguestfs-internal.h;h=ed82fdedc3b4d88eb9619f1c49979bab600acf20;hp=73a14ab7f1c8efb2d8a931158c0ce0aae5ab20b4;hb=a0b7045e0abb7e3a7ff4d1324f16e50de94bed55;hpb=4b753c62089be663ac722e4a875bb061d259e87d

diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h
index 73a14ab..ed82fde 100644
--- a/src/guestfs-internal.h
+++ b/src/guestfs-internal.h
@@ -38,12 +38,6 @@
 #define N_(str) str
 #endif
 
-#ifdef __linux__
-#define CAN_CHECK_PEER_EUID 1
-#else
-#define CAN_CHECK_PEER_EUID 0
-#endif
-
 #define UNIX_PATH_MAX 108
 
 #ifndef MAX
@@ -74,8 +68,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 +98,7 @@ struct guestfs_h
   int autosync;
   int direct;
   int recovery_proc;
+  int enable_network;
 
   char *path;			/* Path to kernel, initrd. */
   char *qemu;			/* Qemu binary. */
@@ -129,6 +122,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 +132,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. */
@@ -209,6 +207,7 @@ 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);
 
 #define error guestfs_error
 #define perrorf guestfs_perrorf