summaryrefslogtreecommitdiffstats
path: root/src/launch.c
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-07-03 13:22:45 +0100
committerRichard W.M. Jones <rjones@redhat.com>2012-07-03 21:27:29 +0100
commitffbf1475f7ae7c462db289ad4834391469e72edd (patch)
tree5caa1b0f2ed83afd56495f9dabf8e81be5f680c7 /src/launch.c
parentbcc4ffb52b9f4b5db7861682905ec32844f4603b (diff)
downloadlibguestfs-ffbf1475f7ae7c462db289ad4834391469e72edd.tar.gz
libguestfs-ffbf1475f7ae7c462db289ad4834391469e72edd.tar.xz
libguestfs-ffbf1475f7ae7c462db289ad4834391469e72edd.zip
New API: guestfs_shutdown: Cleanly shutdown the backend.
The new API splits orderly close into a two-step process: if (guestfs_shutdown (g) == -1) { /* handle the error, eg. qemu error */ } guestfs_close (g); Note that the explicit shutdown step is only necessary in the case where you have made changes to the disk image and want to handle write errors. Read the documentation for further information. This change also: - deprecates guestfs_kill_subprocess - turns guestfs_kill_subprocess into the same as guestfs_shutdown - changes guestfish and other tools to call shutdown + close where necessary (not for read-only tools) - updates documentation - updates examples
Diffstat (limited to 'src/launch.c')
-rw-r--r--src/launch.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/launch.c b/src/launch.c
index 95694ff8..af5ca9fd 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -1629,17 +1629,7 @@ guestfs__wait_ready (guestfs_h *g)
int
guestfs__kill_subprocess (guestfs_h *g)
{
- if (g->state == CONFIG) {
- error (g, _("no subprocess to kill"));
- return -1;
- }
-
- debug (g, "sending SIGTERM to process %d", g->pid);
-
- if (g->pid > 0) kill (g->pid, SIGTERM);
- if (g->recoverypid > 0) kill (g->recoverypid, 9);
-
- return 0;
+ return guestfs__shutdown (g);
}
/* Maximum number of disks. */