From 004ff9048320b92e67e038a7107f768a95ec8bb7 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Thu, 28 Feb 2008 11:17:49 +0000 Subject: [PATCH] Fix qemudReportError. * src/qemu_conf.c: applied patch from Cole Robinson to use virErrorMsg in qemudReportError. Daniel --- ChangeLog | 5 +++++ src/qemu_conf.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d7374e09e1..37cddf4268 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 28 12:16:39 CET 2008 Daniel Veillard + + * src/qemu_conf.c: applied patch from Cole Robinson to use virErrorMsg + in qemudReportError. + Wed Feb 27 20:21:35 EST 2008 Daniel P. Berrange * src/bridge.c, src/bridge.h, src/qemu_conf.c: Set mac address diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 86b487020e..eead0bca29 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -58,6 +58,7 @@ void qemudReportError(virConnectPtr conn, int code, const char *fmt, ...) { va_list args; char errorMessage[QEMUD_MAX_ERROR_LEN]; + const char *virerr; if (fmt) { va_start(args, fmt); @@ -66,8 +67,10 @@ void qemudReportError(virConnectPtr conn, } else { errorMessage[0] = '\0'; } + + virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage[0] : NULL)); __virRaiseError(conn, dom, net, VIR_FROM_QEMU, code, VIR_ERR_ERROR, - NULL, NULL, NULL, -1, -1, "%s", errorMessage); + virerr, errorMessage, NULL, -1, -1, virerr, errorMessage); } int qemudLoadDriverConfig(struct qemud_driver *driver, -- GitLab