External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

hooks: let virCommand do the error reporting

Browse Source 
The code was reporting raw exit status without decoding it into
normal vs. signal exit.  virCommandRun already does this, but
with a different error type, so all we have to do is recast
the error to the correct type.
Reported by li guang.

* src/util/hooks.c (virHookCall): Simplify.
This commit is contained in:
Eric Blake 2012-10-08 21:44:36 -06:00
parent 60dea2c6bf
commit 9c74414ded
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/hooks.c
View File

@ -1,7 +1,7 @@
/* /*
* hooks.c: implementation of the synchronous hooks support * hooks.c: implementation of the synchronous hooks support
* *
* Copyright (C) 2010-2011 Red Hat, Inc. * Copyright (C) 2010-2012 Red Hat, Inc.
* Copyright (C) 2010 Daniel Veillard * Copyright (C) 2010 Daniel Veillard
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -206,7 +206,6 @@ virHookCall(int driver,
char **output) char **output)
{ {
int ret; int ret;
int exitstatus;
char *path; char *path;
virCommandPtr cmd; virCommandPtr cmd;
const char *drvstr; const char *drvstr;
@ -279,12 +278,11 @@ virHookCall(int driver,
if (output) if (output)
virCommandSetOutputBuffer(cmd, output); virCommandSetOutputBuffer(cmd, output);
ret = virCommandRun(cmd, &exitstatus); ret = virCommandRun(cmd, NULL);
if (ret == 0 && exitstatus != 0) { if (ret < 0) {
virReportError(VIR_ERR_HOOK_SCRIPT_FAILED, /* Convert INTERNAL_ERROR into known error. */
_("Hook script %s %s failed with error code %d"), virErrorPtr err = virGetLastError();
path, drvstr, exitstatus); virReportError(VIR_ERR_HOOK_SCRIPT_FAILED, "%s", err->message);
ret = -1;
} }
virCommandFree(cmd); virCommandFree(cmd);