X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2Fguestfs-internal.h;h=4b7cb16e9acb3920663292f746b73d13e19b8680;hp=e2ffdf30220f45a22941faa48886fefceefffbe9;hb=7c89d9ef6b37314fb55aabd0c389a9d652acdb0f;hpb=f173543fd207bdc254a5eb75180d82ef25eacae9 diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index e2ffdf3..4b7cb16 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -22,9 +22,7 @@ #include #include -#ifdef HAVE_PCRE #include -#endif #define STREQ(a,b) (strcmp((a),(b)) == 0) #define STRCASEEQ(a,b) (strcasecmp((a),(b)) == 0) @@ -45,6 +43,26 @@ #define N_(str) str #endif +#ifdef HAVE_SYS_SDT_H +#include +/* NB: The 'name' parameter is a literal identifier, NOT a string! */ +#define TRACE0(name) DTRACE_PROBE(guestfs, name) +#define TRACE1(name, arg1) \ + DTRACE_PROBE(guestfs, name, (arg1)) +#define TRACE2(name, arg1, arg2) \ + DTRACE_PROBE(guestfs, name, (arg1), (arg2)) +#define TRACE3(name, arg1, arg2, arg3) \ + DTRACE_PROBE(guestfs, name, (arg1), (arg2), (arg3)) +#define TRACE4(name, arg1, arg2, arg3, arg4) \ + DTRACE_PROBE(guestfs, name, (arg1), (arg2), (arg3), (arg4)) +#else +#define TRACE0(name) +#define TRACE1(name, arg1) +#define TRACE2(name, arg1, arg2) +#define TRACE3(name, arg1, arg2, arg3) +#define TRACE4(name, arg1, arg2, arg3, arg4) +#endif + #define TMP_TEMPLATE_ON_STACK(var) \ const char *ttos_tmpdir = guestfs_tmpdir (); \ char var[strlen (ttos_tmpdir) + 32]; \ @@ -131,6 +149,19 @@ struct event { void *opaque2; }; +/* Linked list of drives added to the handle. */ +struct drive { + struct drive *next; + + char *path; + + int readonly; + char *format; + char *iface; + char *name; + int use_cache_off; +}; + struct guestfs_h { struct guestfs_h *next; /* Linked list of open handles. */ @@ -138,6 +169,8 @@ struct guestfs_h /* State: see the state machine diagram in the man page guestfs(3). */ enum state state; + struct drive *drives; /* Drives added by add-drive* APIs. */ + int fd[2]; /* Stdin/stdout of qemu. */ int sock; /* Daemon communications socket. */ pid_t pid; /* Qemu PID. */ @@ -172,6 +205,8 @@ struct guestfs_h int pgroup; /* Create process group for children? */ + int smp; /* If > 1, -smp flag passed to qemu. */ + char *last_error; int last_errnum; /* errno, or 0 if there was no errno */ @@ -200,6 +235,11 @@ struct guestfs_h FILE *trace_fp; char *trace_buf; size_t trace_len; + + /* User cancelled transfer. Not signal-atomic, but it doesn't + * matter for this case because we only care if it is != 0. + */ + int user_cancel; }; /* Per-filesystem data stored for inspect_os. */ @@ -214,7 +254,9 @@ enum inspect_fs_content { FS_CONTENT_LINUX_USR_LOCAL, FS_CONTENT_LINUX_VAR, FS_CONTENT_FREEBSD_ROOT, + FS_CONTENT_NETBSD_ROOT, FS_CONTENT_INSTALLER, + FS_CONTENT_HURD_ROOT, }; enum inspect_os_format { @@ -229,6 +271,8 @@ enum inspect_os_type { OS_TYPE_LINUX, OS_TYPE_WINDOWS, OS_TYPE_FREEBSD, + OS_TYPE_NETBSD, + OS_TYPE_HURD, }; enum inspect_os_distro { @@ -248,6 +292,9 @@ enum inspect_os_distro { OS_DISTRO_SLACKWARE, OS_DISTRO_CENTOS, OS_DISTRO_SCIENTIFIC_LINUX, + OS_DISTRO_TTYLINUX, + OS_DISTRO_MAGEIA, + OS_DISTRO_OPENSUSE, }; enum inspect_os_package_format { @@ -256,7 +303,8 @@ enum inspect_os_package_format { OS_PACKAGE_FORMAT_DEB, OS_PACKAGE_FORMAT_PACMAN, OS_PACKAGE_FORMAT_EBUILD, - OS_PACKAGE_FORMAT_PISI + OS_PACKAGE_FORMAT_PISI, + OS_PACKAGE_FORMAT_PKGSRC, }; enum inspect_os_package_management { @@ -268,6 +316,7 @@ enum inspect_os_package_management { OS_PACKAGE_MANAGEMENT_PORTAGE, OS_PACKAGE_MANAGEMENT_PISI, OS_PACKAGE_MANAGEMENT_URPMI, + OS_PACKAGE_MANAGEMENT_ZYPPER, }; struct inspect_fs { @@ -325,9 +374,9 @@ extern void guestfs___debug (guestfs_h *g, const char *fs, ...) extern void guestfs___trace (guestfs_h *g, const char *fs, ...) __attribute__((format (printf,2,3))); extern const char *guestfs___persistent_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 void guestfs___free_drives (struct drive **drives); extern int guestfs___set_busy (guestfs_h *g); extern int guestfs___end_busy (guestfs_h *g); extern int guestfs___send (guestfs_h *g, int proc_nr, uint64_t progress_hint, uint64_t optargs_bitmask, xdrproc_t xdrp, char *args); @@ -343,24 +392,25 @@ extern int guestfs___build_appliance (guestfs_h *g, char **kernel, char **initrd extern void guestfs___launch_send_progress (guestfs_h *g, int perdozen); extern void guestfs___print_BufferIn (FILE *out, const char *buf, size_t buf_size); extern void guestfs___print_BufferOut (FILE *out, const char *buf, size_t buf_size); -#ifdef HAVE_PCRE extern int guestfs___match (guestfs_h *g, const char *str, const pcre *re); extern char *guestfs___match1 (guestfs_h *g, const char *str, const pcre *re); extern int guestfs___match2 (guestfs_h *g, const char *str, const pcre *re, char **ret1, char **ret2); extern int guestfs___match3 (guestfs_h *g, const char *str, const pcre *re, char **ret1, char **ret2, char **ret3); -#endif extern int guestfs___feature_available (guestfs_h *g, const char *feature); extern void guestfs___free_string_list (char **); -extern size_t guestfs___checkpoint_cmdline (guestfs_h *g); -extern void guestfs___rollback_cmdline (guestfs_h *g, size_t pos); +extern struct drive ** guestfs___checkpoint_drives (guestfs_h *g); +extern void guestfs___rollback_drives (guestfs_h *g, struct drive **i); extern void guestfs___call_callbacks_void (guestfs_h *g, uint64_t event); extern void guestfs___call_callbacks_message (guestfs_h *g, uint64_t event, const char *buf, size_t buf_len); extern void guestfs___call_callbacks_array (guestfs_h *g, uint64_t event, const uint64_t *array, size_t array_len); -#if defined(HAVE_PCRE) && defined(HAVE_HIVEX) -extern int guestfs___check_for_filesystem_on (guestfs_h *g, const char *device, int is_block, int is_partnum); +extern int guestfs___is_file_nocase (guestfs_h *g, const char *); +extern int guestfs___is_dir_nocase (guestfs_h *g, const char *); extern char *guestfs___download_to_tmp (guestfs_h *g, struct inspect_fs *fs, const char *filename, const char *basename, int64_t max_size); extern char *guestfs___case_sensitive_path_silently (guestfs_h *g, const char *); extern struct inspect_fs *guestfs___search_for_root (guestfs_h *g, const char *root); + +#if defined(HAVE_HIVEX) +extern int guestfs___check_for_filesystem_on (guestfs_h *g, const char *device, int is_block, int is_partnum); extern int guestfs___parse_unsigned_int (guestfs_h *g, const char *str); extern int guestfs___parse_unsigned_int_ignore_trailing (guestfs_h *g, const char *str); extern int guestfs___parse_major_minor (guestfs_h *g, struct inspect_fs *fs); @@ -371,6 +421,9 @@ extern int guestfs___read_db_dump (guestfs_h *g, const char *dumpfile, void *opa extern int guestfs___check_installer_root (guestfs_h *g, struct inspect_fs *fs); extern int guestfs___check_linux_root (guestfs_h *g, struct inspect_fs *fs); extern int guestfs___check_freebsd_root (guestfs_h *g, struct inspect_fs *fs); +extern int guestfs___check_netbsd_root (guestfs_h *g, struct inspect_fs *fs); +extern int guestfs___check_hurd_root (guestfs_h *g, struct inspect_fs *fs); +extern int guestfs___has_windows_systemroot (guestfs_h *g); extern int guestfs___check_windows_root (guestfs_h *g, struct inspect_fs *fs); #endif @@ -386,11 +439,9 @@ extern int guestfs___check_windows_root (guestfs_h *g, struct inspect_fs *fs); #define safe_strndup guestfs_safe_strndup #define safe_memdup guestfs_safe_memdup #define safe_asprintf guestfs_safe_asprintf -#ifdef HAVE_PCRE #define match guestfs___match #define match1 guestfs___match1 #define match2 guestfs___match2 #define match3 guestfs___match3 -#endif #endif /* GUESTFS_INTERNAL_H_ */