git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement progress messages in the daemon and library.
[libguestfs.git]
/
src
/
guestfs.c
diff --git
a/src/guestfs.c
b/src/guestfs.c
index
871d713
..
206347e
100644
(file)
--- a/
src/guestfs.c
+++ b/
src/guestfs.c
@@
-184,6
+184,8
@@
guestfs_close (guestfs_h *g)
if (g->close_cb)
g->close_cb (g, g->close_cb_data);
if (g->close_cb)
g->close_cb (g, g->close_cb_data);
+ guestfs___free_inspect_info (g);
+
/* Try to sync if autosync flag is set. */
if (g->autosync && g->state == READY) {
guestfs_umount_all (g);
/* Try to sync if autosync flag is set. */
if (g->autosync && g->state == READY) {
guestfs_umount_all (g);
@@
-218,12
+220,6
@@
guestfs_close (guestfs_h *g)
snprintf (filename, sizeof filename, "%s/sock", g->tmpdir);
unlink (filename);
snprintf (filename, sizeof filename, "%s/sock", g->tmpdir);
unlink (filename);
- snprintf (filename, sizeof filename, "%s/initrd", g->tmpdir);
- unlink (filename);
-
- snprintf (filename, sizeof filename, "%s/kernel", g->tmpdir);
- unlink (filename);
-
rmdir (g->tmpdir);
free (g->tmpdir);
rmdir (g->tmpdir);
free (g->tmpdir);
@@
-605,6
+601,19
@@
guestfs__get_recovery_proc (guestfs_h *g)
return g->recovery_proc;
}
return g->recovery_proc;
}
+int
+guestfs__set_network (guestfs_h *g, int v)
+{
+ g->enable_network = !!v;
+ return 0;
+}
+
+int
+guestfs__get_network (guestfs_h *g)
+{
+ return g->enable_network;
+}
+
void
guestfs_set_log_message_callback (guestfs_h *g,
guestfs_log_message_cb cb, void *opaque)
void
guestfs_set_log_message_callback (guestfs_h *g,
guestfs_log_message_cb cb, void *opaque)
@@
-636,3
+645,11
@@
guestfs_set_close_callback (guestfs_h *g,
g->close_cb = cb;
g->close_cb_data = opaque;
}
g->close_cb = cb;
g->close_cb_data = opaque;
}
+
+void
+guestfs_set_progress_callback (guestfs_h *g,
+ guestfs_progress_cb cb, void *opaque)
+{
+ g->progress_cb = cb;
+ g->progress_cb_data = opaque;
+}