summaryrefslogtreecommitdiff
path: root/qga/vss-win32.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-06-19 19:21:59 +0200
committerMarkus Armbruster <armbru@redhat.com>2015-09-10 13:48:06 +0200
commit1e9b65bb1bad51735cab6c861c29b592dccabf0e (patch)
tree167ea3106c677dfbfcc50925105cfe8b005facba /qga/vss-win32.c
parentedf6f3b3358597d37da0cf636ce3ed8a546d0f26 (diff)
downloadqemu-1e9b65bb1bad51735cab6c861c29b592dccabf0e.tar.gz
error: On abort, report where the error was created
This is particularly useful when we abort in error_propagate(), because there the stack backtrace doesn't lead to where the error was created. Looks like this: Unexpected error in parse_block_error_action() at .../qemu/blockdev.c:322: qemu-system-x86_64: -drive if=none,werror=foo: 'foo' invalid write error action Aborted (core dumped) Note: to get this example output, I monkey-patched drive_new() to pass &error_abort to blockdev_init(). To keep the error handling boiler plate from growing even more, all error_setFOO() become macros expanding into error_setFOO_internal() with additional __FILE__, __LINE__, __func__ arguments. Not exactly pretty, but it works. The macro trickery breaks down when you take the address of an error_setFOO(). Fortunately, we do that in just one place: qemu-ga's Windows VSS provider and requester DLL wants to call error_setg_win32() through a function pointer "to avoid linking glib to the DLL". Use error_setg_win32_internal() there. The use of the function pointer is already wrapped in a macro, so the churn isn't bad. Code size increases by some 35KiB for me (0.7%). Tolerable. Could be less if we passed relative rather than absolute source file names to the compiler, or forwent reporting __func__. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Acked-by: Laszlo Ersek <lersek@redhat.com>
Diffstat (limited to 'qga/vss-win32.c')
-rw-r--r--qga/vss-win32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/qga/vss-win32.c b/qga/vss-win32.c
index d75d7bbf09..2142b4964d 100644
--- a/qga/vss-win32.c
+++ b/qga/vss-win32.c
@@ -150,7 +150,7 @@ void qga_vss_fsfreeze(int *nr_volume, Error **errp, bool freeze)
const char *func_name = freeze ? "requester_freeze" : "requester_thaw";
QGAVSSRequesterFunc func;
ErrorSet errset = {
- .error_setg_win32 = error_setg_win32,
+ .error_setg_win32 = error_setg_win32_internal,
.errp = errp,
};