+Thu Oct 9 11:30:00 EST Cole Robinson <crobinso@redhat.com>
+
+ * src/domain_conf.c src/hash.c src/internal.h src/lxc_conf.c
+ src/lxc_conf.h src/network_conf.c src/openvz_conf.c src/openvz_conf.h
+ src/proxy_internal.c src/qemu_conf.c src/qemu_conf.h src/qparams.c
+ src/sexpr.c src/storage_conf.c src/storage_conf.h src/test.c
+ src/util.c src/virterror.c src/xen_internal.c src/xen_unified.c
+ src/xend_internal.c src/xm_internal.c src/xml.c src/xs_internal.c:
+ Centralize majority of error reporting logic.
+
Thu Oct 9 15:49:25 BST Daniel P Berrange <berrange@redhat.com>
* src/lxc_driver.c: Annotate unused parameter
"usb",
"pci")
-static void virDomainReportError(virConnectPtr conn,
- int code, const char *fmt, ...)
- ATTRIBUTE_FORMAT(printf, 3, 4);
-
-static void virDomainReportError(virConnectPtr conn,
- int code, const char *fmt, ...)
-{
- va_list args;
- char errorMessage[1024];
- const char *virerr;
-
- if (fmt) {
- va_start(args, fmt);
- vsnprintf(errorMessage, sizeof(errorMessage)-1, fmt, args);
- va_end(args);
- } else {
- errorMessage[0] = '\0';
- }
-
- virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage : NULL));
- __virRaiseError(conn, NULL, NULL, VIR_FROM_DOMAIN, code, VIR_ERR_ERROR,
- virerr, errorMessage, NULL, -1, -1, virerr, errorMessage);
-}
-
+#define virDomainReportError(conn, code, fmt...) \
+ __virReportErrorHelper(conn, VIR_FROM_DOMAIN, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
virDomainObjPtr virDomainFindByID(const virDomainObjPtr doms,
int id)
/* #define DEBUG_GROW */
+#define virHashError(conn, code, fmt...) \
+ __virReportErrorHelper(conn, VIR_FROM_NONE, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
+
/*
* A single entry in the hash table
*/
* *
************************************************************************/
-/**
- * virHashError:
- * @conn: the connection if available
- * @error: the error number
- * @info: extra information string
- *
- * Handle an error at the connection level
- */
-static void
-virHashError(virConnectPtr conn, virErrorNumber error, const char *info)
-{
- const char *errmsg;
-
- if (error == VIR_ERR_OK)
- return;
-
- errmsg = __virErrorMsg(error, info);
- __virRaiseError(conn, NULL, NULL, VIR_FROM_NONE, error, VIR_ERR_ERROR,
- errmsg, info, NULL, 0, 0, errmsg, info);
-}
-
-
/**
* virDomainFreeName:
* @domain: a domain object
int int1, int int2, const char *msg, ...)
ATTRIBUTE_FORMAT(printf, 12, 13);
const char *__virErrorMsg(virErrorNumber error, const char *info);
+void __virReportErrorHelper(virConnectPtr conn, int domcode, int errcode,
+ const char *filename ATTRIBUTE_UNUSED,
+ const char *funcname ATTRIBUTE_UNUSED,
+ long long linenr ATTRIBUTE_UNUSED,
+ const char *fmt, ...)
+ ATTRIBUTE_FORMAT(printf, 7, 8);
/************************************************************************
* *
#include "lxc_conf.h"
/* Functions */
-void lxcError(virConnectPtr conn, virDomainPtr dom, int code,
- const char *fmt, ...)
-{
- va_list args;
- char errorMessage[1024];
- const char *codeErrorMessage;
-
- if (fmt) {
- va_start(args, fmt);
- vsnprintf(errorMessage, sizeof(errorMessage)-1, fmt, args);
- va_end(args);
- } else {
- errorMessage[0] = '\0';
- }
-
- codeErrorMessage = __virErrorMsg(code, fmt);
- __virRaiseError(conn, dom, NULL, VIR_FROM_LXC, code, VIR_ERR_ERROR,
- codeErrorMessage, errorMessage, NULL, 0, 0,
- codeErrorMessage, errorMessage);
-}
-
virCapsPtr lxcCapsInit(void)
{
struct utsname utsname;
int lxcLoadDriverConfig(lxc_driver_t *driver);
virCapsPtr lxcCapsInit(void);
-void lxcError(virConnectPtr conn,
- virDomainPtr dom,
- int code, const char *fmt, ...)
- ATTRIBUTE_FORMAT(printf,4,5);
+#define lxcError(conn, dom, code, fmt...) \
+ __virReportErrorHelper(conn, VIR_FROM_LXC, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
#endif /* LXC_CONF_H */
VIR_NETWORK_FORWARD_LAST,
"none", "nat", "route" )
-static void virNetworkReportError(virConnectPtr conn,
- int code, const char *fmt, ...)
-{
- va_list args;
- char errorMessage[1024];
- const char *virerr;
-
- if (fmt) {
- va_start(args, fmt);
- vsnprintf(errorMessage, sizeof(errorMessage)-1, fmt, args);
- va_end(args);
- } else {
- errorMessage[0] = '\0';
- }
-
- virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage : NULL));
- __virRaiseError(conn, NULL, NULL, VIR_FROM_NETWORK, code, VIR_ERR_ERROR,
- virerr, errorMessage, NULL, -1, -1, virerr, errorMessage);
-}
-
+#define virNetworkReportError(conn, code, fmt...) \
+ __virReportErrorHelper(conn, VIR_FROM_NETWORK, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
virNetworkObjPtr virNetworkFindByUUID(const virNetworkObjPtr nets,
const unsigned char *uuid)
static int openvzLocateConfFile(int vpsid, char *conffile, int maxlen);
static int openvzAssignUUIDs(void);
-void
-openvzError (virConnectPtr conn, virErrorNumber code, const char *fmt, ...)
-{
- va_list args;
- char errorMessage[1024];
- const char *errmsg;
-
- if (fmt) {
- va_start(args, fmt);
- vsnprintf(errorMessage, sizeof(errorMessage)-1, fmt, args);
- va_end(args);
- } else {
- errorMessage[0] = '\0';
- }
-
- errmsg = __virErrorMsg(code, (errorMessage[0] ? errorMessage : NULL));
- __virRaiseError (conn, NULL, NULL, VIR_FROM_OPENVZ,
- code, VIR_ERR_ERROR, errmsg, errorMessage, NULL, 0, 0,
- errmsg, errorMessage);
-}
-
-
int
strtoI(const char *str)
{
fprintf(stderr, msg);\
fprintf(stderr, "\n"); }
+#define openvzError(conn, code, fmt...) \
+ __virReportErrorHelper(conn, VIR_FROM_OPENVZ, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
+
+
/* OpenVZ commands - Replace with wrapper scripts later? */
#define VZLIST "vzlist"
#define VZCTL "vzctl"
virDomainObjPtr domains;
};
-void openvzError (virConnectPtr conn, virErrorNumber code, const char *fmt, ...)
- ATTRIBUTE_FORMAT(printf, 3, 4);
int openvz_readline(int fd, char *ptr, int maxlen);
int openvzReadConfigParam(int vpsid ,const char * param, char *value, int maxlen);
virCapsPtr openvzCapsInit(void);
* *
************************************************************************/
-/**
- * virProxyError:
- * @conn: the connection if available
- * @error: the error number
- * @info: extra information string
- *
- * Handle an error at the xend daemon interface
- */
-static void
-virProxyError(virConnectPtr conn, virErrorNumber error, const char *info)
-{
- const char *errmsg;
-
- if (error == VIR_ERR_OK)
- return;
-
- errmsg = __virErrorMsg(error, info);
- __virRaiseError(conn, NULL, NULL, VIR_FROM_PROXY, error, VIR_ERR_ERROR,
- errmsg, info, NULL, 0, 0, errmsg, info);
-}
+#define virProxyError(conn, code, fmt...) \
+ __virReportErrorHelper(conn, VIR_FROM_PROXY, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
/************************************************************************
* *
#define qemudLog(level, msg...) fprintf(stderr, msg)
-void qemudReportError(virConnectPtr conn,
- virDomainPtr dom,
- virNetworkPtr net,
- int code, const char *fmt, ...) {
- va_list args;
- char errorMessage[1024];
- const char *virerr;
-
- if (fmt) {
- va_start(args, fmt);
- vsnprintf(errorMessage, sizeof(errorMessage)-1, fmt, args);
- va_end(args);
- } else {
- errorMessage[0] = '\0';
- }
-
- virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage : NULL));
- __virRaiseError(conn, dom, net, VIR_FROM_QEMU, code, VIR_ERR_ERROR,
- virerr, errorMessage, NULL, -1, -1, virerr, errorMessage);
-}
-
int qemudLoadDriverConfig(struct qemud_driver *driver,
const char *filename) {
virConfPtr conf;
};
-void qemudReportError(virConnectPtr conn,
- virDomainPtr dom,
- virNetworkPtr net,
- int code, const char *fmt, ...)
- ATTRIBUTE_FORMAT(printf,5,6);
+#define qemudReportError(conn, dom, net, code, fmt...) \
+ __virReportErrorHelper(conn, VIR_FROM_QEMU, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
int qemudLoadDriverConfig(struct qemud_driver *driver,
#include "memory.h"
#include "qparams.h"
-static void
-qparam_report_oom(void)
-{
- const char *virerr = __virErrorMsg(VIR_ERR_NO_MEMORY, NULL);
- __virRaiseError(NULL, NULL, NULL, VIR_FROM_NONE, VIR_ERR_NO_MEMORY, VIR_ERR_ERROR,
- virerr, NULL, NULL, -1, -1, virerr, NULL);
-}
+#define qparam_report_oom(void) \
+ __virReportErrorHelper(NULL, VIR_FROM_NONE, VIR_ERR_NO_MEMORY, \
+ __FILE__, __FUNCTION__, __LINE__, NULL)
struct qparam_set *
new_qparam_set (int init_alloc, ...)
#include "util.h"
#include "memory.h"
-/**
- * virSexprError:
- * @conn: the connection if available
- * @error: the error number
- * @info: extra information string
- *
- * Handle an error in the S-Expression code
- */
-static void
-virSexprError(virErrorNumber error, const char *info)
-{
- const char *errmsg;
-
- if (error == VIR_ERR_OK)
- return;
-
- errmsg = __virErrorMsg(error, info);
- __virRaiseError(NULL, NULL, NULL, VIR_FROM_SEXPR, error, VIR_ERR_ERROR,
- errmsg, info, NULL, 0, 0, errmsg, info);
-}
+#define virSexprError(code, fmt...) \
+ __virReportErrorHelper(NULL, VIR_FROM_SEXPR, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
/**
* sexpr_new:
return (ret);
error:
buffer[n_buffer - 1] = 0;
- virSexprError(VIR_ERR_SEXPR_SERIAL, buffer);
+ virSexprError(VIR_ERR_SEXPR_SERIAL, "%s", buffer);
return (0);
}
#define virStorageLog(msg...) fprintf(stderr, msg)
-void
-virStorageReportError(virConnectPtr conn, int code, const char *fmt, ...) {
- va_list args;
- char errorMessage[1024];
-
- if (fmt) {
- va_start(args, fmt);
- vsnprintf(errorMessage, sizeof(errorMessage)-1, fmt, args);
- va_end(args);
- } else {
- errorMessage[0] = '\0';
- }
- virStorageLog("%s", errorMessage);
- __virRaiseError(conn, NULL, NULL, VIR_FROM_STORAGE, code, VIR_ERR_ERROR,
- NULL, NULL, NULL, -1, -1, "%s", errorMessage);
-}
-
-
-
void
virStorageVolDefFree(virStorageVolDefPtr def) {
int i;
return pool->active;
}
-void virStorageReportError(virConnectPtr conn,
- int code,
- const char *fmt, ...)
- ATTRIBUTE_FORMAT(printf, 3, 4);
+#define virStorageReportError(conn, code, fmt...) \
+ __virReportErrorHelper(conn, VIR_FROM_STORAGE, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
int virStoragePoolObjScanConfigs(virStorageDriverStatePtr driver);
privconn = (testConnPtr)conn->privateData;
-static void
-testError(virConnectPtr con,
- virDomainPtr dom,
- virNetworkPtr net,
- virErrorNumber error,
- const char *info)
-{
- const char *errmsg;
-
- if (error == VIR_ERR_OK)
- return;
-
- errmsg = __virErrorMsg(error, info);
- __virRaiseError(con, dom, net, VIR_FROM_TEST, error, VIR_ERR_ERROR,
- errmsg, info, NULL, 0, 0, errmsg, info, 0);
-}
+#define testError(conn, dom, net, code, fmt...) \
+ __virReportErrorHelper(conn, VIR_FROM_TEST, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
static virCapsPtr
testBuildCapabilities(virConnectPtr conn) {
r = gethostname (hostname, HOST_NAME_MAX+1);
if (r == -1) {
- testError (conn, NULL, NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno));
+ testError (conn, NULL, NULL, VIR_ERR_SYSTEM_ERROR, "%s",
+ strerror (errno));
return NULL;
}
str = strdup (hostname);
if (str == NULL) {
- testError (conn, NULL, NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno));
+ testError (conn, NULL, NULL, VIR_ERR_SYSTEM_ERROR, "%s",
+ strerror (errno));
return NULL;
}
return str;
GET_CONNECTION(conn);
if (asprintf (&uri, "test://%s", privconn->path) == -1) {
- testError (conn, NULL, NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno));
+ testError (conn, NULL, NULL, VIR_ERR_SYSTEM_ERROR, "%s",
+ strerror (errno));
return NULL;
}
return uri;
# define MIN(a, b) ((a) < (b) ? (a) : (b))
#endif
-#define MAX_ERROR_LEN 1024
-
#define virLog(msg...) fprintf(stderr, msg)
#ifndef PROXY
-static void
-ReportError(virConnectPtr conn,
- int code, const char *fmt, ...)
- ATTRIBUTE_FORMAT(printf, 3, 4);
-
-static void
-ReportError(virConnectPtr conn,
- int code, const char *fmt, ...) {
- va_list args;
- char errorMessage[MAX_ERROR_LEN];
-
- if (fmt) {
- va_start(args, fmt);
- vsnprintf(errorMessage, MAX_ERROR_LEN-1, fmt, args);
- va_end(args);
- } else {
- errorMessage[0] = '\0';
- }
- __virRaiseError(conn, NULL, NULL, VIR_FROM_NONE, code, VIR_ERR_ERROR,
- NULL, NULL, NULL, -1, -1, "%s", errorMessage);
-}
+
+#define ReportError(conn, code, fmt...) \
+ __virReportErrorHelper(conn, VIR_FROM_NONE, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
int virFileStripSuffix(char *str,
const char *suffix)
}
return (errmsg);
}
+
+/**
+ * __virReportErrorHelper
+ *
+ * @conn: the connection to the hypervisor if available
+ * @dom: the domain if available
+ * @net: the network if available
+ * @domcode: the virErrorDomain indicating where it's coming from
+ * @errcode: the virErrorNumber code for the error
+ * @filename: Source file error is dispatched from
+ * @funcname: Function error is dispatched from
+ * @linenr: Line number error is dispatched from
+ * @msg: the message to display/transmit
+ * @...: extra parameters for the message display
+ *
+ * Helper function to do most of the grunt work for individual driver
+ * ReportError
+ */
+void __virReportErrorHelper(virConnectPtr conn, int domcode, int errcode,
+ const char *filename ATTRIBUTE_UNUSED,
+ const char *funcname ATTRIBUTE_UNUSED,
+ long long linenr ATTRIBUTE_UNUSED,
+ const char *fmt, ...)
+{
+ va_list args;
+ char errorMessage[1024];
+ const char *virerr;
+
+ if (fmt) {
+ va_start(args, fmt);
+ vsnprintf(errorMessage, sizeof(errorMessage)-1, fmt, args);
+ va_end(args);
+ } else {
+ errorMessage[0] = '\0';
+ }
+
+ virerr = __virErrorMsg(errcode, (errorMessage[0] ? errorMessage : NULL));
+ __virRaiseError(conn, NULL, NULL, domcode, errcode, VIR_ERR_ERROR,
+ virerr, errorMessage, NULL, -1, -1, virerr, errorMessage);
+
+}
};
#endif /* !PROXY */
-/**
- * virXenError:
- * @conn: connection, if known
- * @error: the error number
- * @info: extra information string
- * @value: extra information number
- *
- * Handle an error at the xend daemon interface
- */
-static void
-virXenError(virConnectPtr conn,
- virErrorNumber error, const char *info, int value)
-{
- const char *errmsg;
-
- if ((error == VIR_ERR_OK) || (in_init != 0))
- return;
-
- errmsg = __virErrorMsg(error, info);
- __virRaiseError(conn, NULL, NULL, VIR_FROM_XEN, error, VIR_ERR_ERROR,
- errmsg, info, NULL, value, 0, errmsg, info, value);
-}
+#define virXenError(conn, code, fmt...) \
+ if (in_init == 0) \
+ __virReportErrorHelper(conn, VIR_FROM_XEN, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
#ifndef PROXY
#endif /* PROXY */
-/**
- * virXenPerror:
- * @conn: the connection (if available)
- * @msg: name of system call or file (as in perror(3))
- *
- * Raise error from a failed system call, using errno as the source.
- */
-static void
-virXenPerror (virConnectPtr conn, const char *msg)
-{
- char *msg_s;
-
- if (VIR_ALLOC_N(msg_s, strlen (msg) + 10) == 0) {
- strcpy (msg_s, msg);
- strcat (msg_s, ": %s");
- }
-
- __virRaiseError (conn, NULL, NULL,
- VIR_FROM_XEN, VIR_ERR_SYSTEM_ERROR, VIR_ERR_ERROR,
- msg, NULL, NULL, errno, 0,
- msg_s ? msg_s : msg, strerror (errno));
-}
-
/**
* xenHypervisorDoV0Op:
* @handle: the handle to the Xen hypervisor
hc.arg[0] = (unsigned long) op;
if (lock_pages(op, sizeof(dom0_op_t)) < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " locking", sizeof(*op));
+ virXenError(NULL, VIR_ERR_XEN_CALL, " locking");
return (-1);
}
ret = ioctl(handle, xen_ioctl_hypercall_cmd, (unsigned long) &hc);
if (ret < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl ", xen_ioctl_hypercall_cmd);
+ virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %d",
+ xen_ioctl_hypercall_cmd);
}
if (unlock_pages(op, sizeof(dom0_op_t)) < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " releasing", sizeof(*op));
+ virXenError(NULL, VIR_ERR_XEN_CALL, " releasing");
ret = -1;
}
hc.arg[0] = (unsigned long) op;
if (lock_pages(op, sizeof(dom0_op_t)) < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " locking", sizeof(*op));
+ virXenError(NULL, VIR_ERR_XEN_CALL, " locking");
return (-1);
}
ret = ioctl(handle, xen_ioctl_hypercall_cmd, (unsigned long) &hc);
if (ret < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl ", xen_ioctl_hypercall_cmd);
+ virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %d",
+ xen_ioctl_hypercall_cmd);
}
if (unlock_pages(op, sizeof(dom0_op_t)) < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " releasing", sizeof(*op));
+ virXenError(NULL, VIR_ERR_XEN_CALL, " releasing");
ret = -1;
}
hc.arg[0] = (unsigned long) op;
if (lock_pages(op, sizeof(dom0_op_t)) < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " locking", sizeof(*op));
+ virXenError(NULL, VIR_ERR_XEN_CALL, " locking");
return (-1);
}
ret = ioctl(handle, xen_ioctl_hypercall_cmd, (unsigned long) &hc);
if (ret < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " sys ioctl ", xen_ioctl_hypercall_cmd);
+ virXenError(NULL, VIR_ERR_XEN_CALL, " sys ioctl %d",
+ xen_ioctl_hypercall_cmd);
}
if (unlock_pages(op, sizeof(dom0_op_t)) < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " releasing", sizeof(*op));
+ virXenError(NULL, VIR_ERR_XEN_CALL, " releasing");
ret = -1;
}
hc.arg[0] = (unsigned long) op;
if (lock_pages(op, sizeof(dom0_op_t)) < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " locking", sizeof(*op));
+ virXenError(NULL, VIR_ERR_XEN_CALL, " locking");
return (-1);
}
ret = ioctl(handle, xen_ioctl_hypercall_cmd, (unsigned long) &hc);
if (ret < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl ", xen_ioctl_hypercall_cmd);
+ virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %d",
+ xen_ioctl_hypercall_cmd);
}
if (unlock_pages(op, sizeof(dom0_op_t)) < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " releasing", sizeof(*op));
+ virXenError(NULL, VIR_ERR_XEN_CALL, " releasing");
ret = -1;
}
if (lock_pages(XEN_GETDOMAININFOLIST_DATA(dominfos),
XEN_GETDOMAININFO_SIZE * maxids) < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " locking",
- XEN_GETDOMAININFO_SIZE * maxids);
+ virXenError(NULL, VIR_ERR_XEN_CALL, " locking");
return (-1);
}
if (hypervisor_version > 1) {
}
if (unlock_pages(XEN_GETDOMAININFOLIST_DATA(dominfos),
XEN_GETDOMAININFO_SIZE * maxids) < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " release",
- XEN_GETDOMAININFO_SIZE * maxids);
+ virXenError(NULL, VIR_ERR_XEN_CALL, " release");
ret = -1;
}
return(ret);
xen_op_v2_dom op;
if (lock_pages(cpumap, maplen) < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " locking", maplen);
+ virXenError(NULL, VIR_ERR_XEN_CALL, " locking");
return (-1);
}
memset(&op, 0, sizeof(op));
VIR_FREE(new);
if (unlock_pages(cpumap, maplen) < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " release", maplen);
+ virXenError(NULL, VIR_ERR_XEN_CALL, " release");
ret = -1;
}
} else {
}
if ((cpumap != NULL) && (maplen > 0)) {
if (lock_pages(cpumap, maplen) < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " locking", maplen);
+ virXenError(NULL, VIR_ERR_XEN_CALL, " locking");
return (-1);
}
memset(cpumap, 0, maplen);
}
ret = xenHypervisorDoV2Dom(handle, &op);
if (unlock_pages(cpumap, maplen) < 0) {
- virXenError(NULL, VIR_ERR_XEN_CALL, " release", maplen);
+ virXenError(NULL, VIR_ERR_XEN_CALL, " release");
ret = -1;
}
}
char error[100];
regerror (errcode, &flags_hvm_rec, error, sizeof error);
regfree (&flags_hvm_rec);
- virXenError (NULL, VIR_ERR_INTERNAL_ERROR, error, 0);
+ virXenError (NULL, VIR_ERR_INTERNAL_ERROR, "%s", error);
in_init = 0;
return -1;
}
regerror (errcode, &flags_pae_rec, error, sizeof error);
regfree (&flags_pae_rec);
regfree (&flags_hvm_rec);
- virXenError (NULL, VIR_ERR_INTERNAL_ERROR, error, 0);
+ virXenError (NULL, VIR_ERR_INTERNAL_ERROR, "%s", error);
in_init = 0;
return -1;
}
regfree (&xen_cap_rec);
regfree (&flags_pae_rec);
regfree (&flags_hvm_rec);
- virXenError (NULL, VIR_ERR_INTERNAL_ERROR, error, 0);
+ virXenError (NULL, VIR_ERR_INTERNAL_ERROR, "%s", error);
in_init = 0;
return -1;
}
*/
hypervisor_version = -1;
- virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl ", IOCTL_PRIVCMD_HYPERCALL);
+ virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %lu", IOCTL_PRIVCMD_HYPERCALL);
close(fd);
in_init = 0;
return(-1);
hypervisor_version = 2;
if (VIR_ALLOC(ipt) < 0) {
- virXenError(NULL, VIR_ERR_NO_MEMORY, __FUNCTION__, 0);
+ virXenError(NULL, VIR_ERR_NO_MEMORY, NULL);
return(-1);
}
/* Currently consider RHEL5.0 Fedora7, xen-3.1, and xen-unstable */
DEBUG0("Failed to find any Xen hypervisor method\n");
hypervisor_version = -1;
- virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl ", IOCTL_PRIVCMD_HYPERCALL);
+ virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %lu", IOCTL_PRIVCMD_HYPERCALL);
close(fd);
in_init = 0;
VIR_FREE(ipt);
ret = open(XEN_HYPERVISOR_SOCKET, O_RDWR);
if (ret < 0) {
- virXenError(conn, VIR_ERR_NO_XEN, XEN_HYPERVISOR_SOCKET, 0);
+ virXenError(conn, VIR_ERR_NO_XEN, "%s", XEN_HYPERVISOR_SOCKET);
return (-1);
}
return caps;
no_memory:
- virXenError(NULL, VIR_ERR_NO_MEMORY, __FUNCTION__, 0);
+ virXenError(NULL, VIR_ERR_NO_MEMORY, NULL);
virCapabilitiesFree(caps);
return NULL;
}
cpuinfo = fopen ("/proc/cpuinfo", "r");
if (cpuinfo == NULL) {
if (errno != ENOENT) {
- virXenPerror (NULL, "/proc/cpuinfo");
+ virXenError (conn, VIR_ERR_SYSTEM_ERROR,
+ "/proc/cpuinfo: %s", strerror(errno));
return NULL;
}
}
if (capabilities == NULL) {
if (errno != ENOENT) {
fclose(cpuinfo);
- virXenPerror (NULL, "/sys/hypervisor/properties/capabilities");
+ virXenError (conn, VIR_ERR_SYSTEM_ERROR,
+ "/sys/hypervisor/properties/capabilities: %s",
+ strerror(errno));
return NULL;
}
}
char *xml;
if (!(xml = virCapabilitiesFormatXML(priv->caps))) {
- virXenError(conn, VIR_ERR_NO_MEMORY, NULL, 0);
+ virXenError(conn, VIR_ERR_NO_MEMORY, NULL);
return NULL;
}
[XEN_UNIFIED_XM_OFFSET] = &xenXMDriver,
};
-/**
- * xenUnifiedError:
- * @conn: the connection
- * @error: the error number
- * @info: extra information string
- *
- * Handle an error at the xend daemon interface
- */
-static void
-xenUnifiedError (virConnectPtr conn, virErrorNumber error, const char *info)
-{
- const char *errmsg;
-
- errmsg = __virErrorMsg (error, info);
- __virRaiseError (conn, NULL, NULL, VIR_FROM_XEN, error, VIR_ERR_ERROR,
- errmsg, info, NULL, 0, 0, errmsg, info);
-}
+#define xenUnifiedError(conn, code, fmt...) \
+ __virReportErrorHelper(conn, VIR_FROM_XEN, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
/*
* Helper functions currently used in the NUMA code
r = gethostname (hostname, HOST_NAME_MAX+1);
if (r == -1) {
- xenUnifiedError (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno));
+ xenUnifiedError (conn, VIR_ERR_SYSTEM_ERROR, "%s", strerror(errno));
return NULL;
}
str = strdup (hostname);
if (str == NULL) {
- xenUnifiedError (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno));
+ xenUnifiedError (conn, VIR_ERR_SYSTEM_ERROR, "%s", strerror(errno));
return NULL;
}
return str;
int ref_len);
#endif
-static void virXendError(virConnectPtr conn, virErrorNumber error,
- const char *fmt, ...)
- ATTRIBUTE_FORMAT(printf,3,4);
+#define virXendError(conn, code, fmt...) \
+ __virReportErrorHelper(conn, VIR_FROM_XEND, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
-#define MAX_ERROR_MESSAGE_LEN 1024
-
-/**
- * virXendError:
- * @conn: the connection if available
- * @error: the error number
- * @fmt: format string followed by variable args
- *
- * Handle an error at the xend daemon interface
- */
-static void
-virXendError(virConnectPtr conn, virErrorNumber error,
- const char *fmt, ...)
-{
- va_list args;
- char msg[MAX_ERROR_MESSAGE_LEN];
- const char *msg2;
-
- if (fmt) {
- va_start (args, fmt);
- vsnprintf (msg, sizeof (msg), fmt, args);
- va_end (args);
- } else {
- msg[0] = '\0';
- }
-
- msg2 = __virErrorMsg (error, fmt ? msg : NULL);
- __virRaiseError(conn, NULL, NULL, VIR_FROM_XEND, error, VIR_ERR_ERROR,
- msg2, msg, NULL, 0, 0, msg2, msg);
-}
-
-/**
- * virXendErrorInt:
- * @conn: the connection if available
- * @error: the error number
- * @val: extra integer information
- *
- * Handle an error at the xend daemon interface
- */
-static void
-virXendErrorInt(virConnectPtr conn, virErrorNumber error, int val)
-{
- const char *errmsg;
-
- if (error == VIR_ERR_OK)
- return;
-
- errmsg = __virErrorMsg(error, NULL);
- __virRaiseError(conn, NULL, NULL, VIR_FROM_XEND, error, VIR_ERR_ERROR,
- errmsg, NULL, NULL, val, 0, errmsg, val);
-}
+#define virXendErrorInt(conn, code, ival) \
+ virXendError(conn, code, "%d", ival)
/**
* do_connect:
NULL, /* domainSetSchedulerParameters */
};
-static void
-xenXMError(virConnectPtr conn, int code, const char *fmt, ...)
-{
- va_list args;
- char errorMessage[1024];
- const char *virerr;
-
- if (fmt) {
- va_start(args, fmt);
- vsnprintf(errorMessage, sizeof(errorMessage)-1, fmt, args);
- va_end(args);
- } else {
- errorMessage[0] = '\0';
- }
-
- virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage : NULL));
- __virRaiseError(conn, NULL, NULL, VIR_FROM_XENXM, code, VIR_ERR_ERROR,
- virerr, errorMessage, NULL, -1, -1, virerr, errorMessage);
-}
+#define xenXMError(conn, code, fmt...) \
+ __virReportErrorHelper(conn, VIR_FROM_XENXM, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
int
xenXMInit (void)
int ret = -1;
if (now == ((time_t)-1)) {
- xenXMError (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno));
+ xenXMError (conn, VIR_ERR_SYSTEM_ERROR, "%s", strerror(errno));
return (-1);
}
/* Process the files in the config dir */
if (!(dh = opendir(configDir))) {
- xenXMError (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno));
+ xenXMError (conn, VIR_ERR_SYSTEM_ERROR, "%s", strerror(errno));
return (-1);
}
} else { /* Completely new entry */
newborn = 1;
if (VIR_ALLOC(entry) < 0) {
- xenXMError (conn, VIR_ERR_NO_MEMORY, strerror (errno));
+ xenXMError (conn, VIR_ERR_NO_MEMORY, "%s", strerror(errno));
goto cleanup;
}
memcpy(entry->filename, path, PATH_MAX);
#include "util.h"
#include "memory.h"
-/**
- * virXMLError:
- * @conn: a connection if any
- * @error: the error number
- * @info: information/format string
- * @value: extra integer parameter for the error string
- *
- * Report an error coming from the XML module.
- */
-static void
-virXMLError(virConnectPtr conn, virErrorNumber error, const char *info,
- int value)
-{
- const char *errmsg;
-
- if (error == VIR_ERR_OK)
- return;
-
- errmsg = __virErrorMsg(error, info);
- __virRaiseError(conn, NULL, NULL, VIR_FROM_XML, error, VIR_ERR_ERROR,
- errmsg, info, NULL, value, 0, errmsg, info, value);
-}
+#define virXMLError(conn, code, fmt...) \
+ __virReportErrorHelper(conn, VIR_FROM_XML, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
/************************************************************************
if ((ctxt == NULL) || (xpath == NULL)) {
virXMLError(conn, VIR_ERR_INTERNAL_ERROR,
- _("Invalid parameter to virXPathString()"), 0);
+ _("Invalid parameter to virXPathString()"));
return (NULL);
}
relnode = ctxt->node;
ret = strdup((char *) obj->stringval);
xmlXPathFreeObject(obj);
if (ret == NULL) {
- virXMLError(conn, VIR_ERR_NO_MEMORY, _("strdup failed"), 0);
+ virXMLError(conn, VIR_ERR_NO_MEMORY, _("strdup failed"));
}
ctxt->node = relnode;
return (ret);
if ((ctxt == NULL) || (xpath == NULL) || (value == NULL)) {
virXMLError(conn, VIR_ERR_INTERNAL_ERROR,
- _("Invalid parameter to virXPathNumber()"), 0);
+ _("Invalid parameter to virXPathNumber()"));
return (-1);
}
relnode = ctxt->node;
if ((ctxt == NULL) || (xpath == NULL) || (value == NULL)) {
virXMLError(conn, VIR_ERR_INTERNAL_ERROR,
- _("Invalid parameter to virXPathNumber()"), 0);
+ _("Invalid parameter to virXPathNumber()"));
return (-1);
}
relnode = ctxt->node;
if ((ctxt == NULL) || (xpath == NULL) || (value == NULL)) {
virXMLError(conn, VIR_ERR_INTERNAL_ERROR,
- _("Invalid parameter to virXPathNumber()"), 0);
+ _("Invalid parameter to virXPathNumber()"));
return (-1);
}
relnode = ctxt->node;
if ((ctxt == NULL) || (xpath == NULL)) {
virXMLError(conn, VIR_ERR_INTERNAL_ERROR,
- _("Invalid parameter to virXPathBoolean()"), 0);
+ _("Invalid parameter to virXPathBoolean()"));
return (-1);
}
relnode = ctxt->node;
if ((ctxt == NULL) || (xpath == NULL)) {
virXMLError(conn, VIR_ERR_INTERNAL_ERROR,
- _("Invalid parameter to virXPathNode()"), 0);
+ _("Invalid parameter to virXPathNode()"));
return (NULL);
}
relnode = ctxt->node;
if ((ctxt == NULL) || (xpath == NULL)) {
virXMLError(conn, VIR_ERR_INTERNAL_ERROR,
- _("Invalid parameter to virXPathNodeSet()"), 0);
+ _("Invalid parameter to virXPathNodeSet()"));
return (-1);
}
if (list != NULL && ret) {
if (VIR_ALLOC_N(*list, ret) < 0) {
virXMLError(conn, VIR_ERR_NO_MEMORY,
- _("allocate string array"),
+ _("allocate string array size %lu"),
ret * sizeof(**list));
ret = -1;
} else {
#endif /* ! PROXY */
-/**
- * virXenStoreError:
- * @conn: the connection if available
- * @error: the error number
- * @info: extra information string
- *
- * Handle an error at the xend store interface
- */
-static void
-virXenStoreError(virConnectPtr conn, virErrorNumber error, const char *info)
-{
- const char *errmsg;
-
- if (error == VIR_ERR_OK)
- return;
-
- errmsg = __virErrorMsg(error, info);
- __virRaiseError(conn, NULL, NULL, VIR_FROM_XENSTORE, error, VIR_ERR_ERROR,
- errmsg, info, NULL, 0, 0, errmsg, info);
-}
+#define virXenStoreError(conn, code, fmt...) \
+ __virReportErrorHelper(NULL, VIR_FROM_XENSTORE, code, __FILE__, \
+ __FUNCTION__, __LINE__, fmt)
/************************************************************************
* *
projects / libvirt.git / commitdiff