X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2Fguestfs-internal.h;h=ed82fdedc3b4d88eb9619f1c49979bab600acf20;hp=f2abeba1d592687f43aaa4f3375587d82d2b9693;hb=e903739935ce32190b1c7b087d2cd9c2d2a7ec88;hpb=5c31f6126ba4ea3e9056c34c300f6f5e332ab997 diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index f2abeba..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. */