Rename of the macros where available, or remapping of the qemudLog
to the new macros.
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
daniel@xxxxxxxxxxxx | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library http://libvirt.org/
Index: qemud/event.c
===================================================================
RCS file: /data/cvs/libxen/qemud/event.c,v
retrieving revision 1.16
diff -u -r1.16 event.c
--- qemud/event.c 4 Dec 2008 22:14:15 -0000 1.16
+++ qemud/event.c 17 Dec 2008 14:25:56 -0000
@@ -35,7 +35,7 @@
#include "memory.h"
#include "util.h"
-#define EVENT_DEBUG(fmt, ...) qemudDebug("EVENT: " fmt, __VA_ARGS__)
+#define EVENT_DEBUG(fmt, ...) VIR_DEBUG("event", fmt, __VA_ARGS__)
static int virEventInterruptLocked(void);
Index: qemud/mdns.c
===================================================================
RCS file: /data/cvs/libxen/qemud/mdns.c,v
retrieving revision 1.12
diff -u -r1.12 mdns.c
--- qemud/mdns.c 19 Nov 2008 16:24:01 -0000 1.12
+++ qemud/mdns.c 17 Dec 2008 14:25:56 -0000
@@ -44,7 +44,7 @@
#include "remote_internal.h"
#include "memory.h"
-#define AVAHI_DEBUG(fmt, ...) qemudDebug("AVAHI: " fmt, __VA_ARGS__)
+#define AVAHI_DEBUG(fmt, ...) VIR_DEBUG("avahi", fmt, __VA_ARGS__)
struct libvirtd_mdns_entry {
char *type;
Index: qemud/remote.c
===================================================================
RCS file: /data/cvs/libxen/qemud/remote.c,v
retrieving revision 1.52
diff -u -r1.52 remote.c
--- qemud/remote.c 4 Dec 2008 22:16:40 -0000 1.52
+++ qemud/remote.c 17 Dec 2008 14:25:57 -0000
@@ -53,7 +53,7 @@
#include "qemud.h"
#include "memory.h"
-#define REMOTE_DEBUG(fmt,...) qemudDebug("REMOTE: " fmt, __VA_ARGS__)
+#define REMOTE_DEBUG(fmt, ...) VIR_DEBUG("remote", fmt, __VA_ARGS__)
static void remoteDispatchFormatError (remote_error *rerr,
const char *fmt, ...)
@@ -2543,7 +2543,7 @@
REMOTE_DEBUG("Initialize SASL auth %d", client->fd);
if (client->auth != REMOTE_AUTH_SASL ||
client->saslconn != NULL) {
- qemudLog(QEMUD_ERR, "%s", _("client tried invalid SASL init request"));
+ ERROR0(_("client tried invalid SASL init request"));
goto authfail;
}
@@ -2583,7 +2583,7 @@
VIR_FREE(localAddr);
VIR_FREE(remoteAddr);
if (err != SASL_OK) {
- qemudLog(QEMUD_ERR, _("sasl context setup failed %d (%s)"),
+ ERROR(_("sasl context setup failed %d (%s)"),
err, sasl_errstring(err, NULL, NULL));
client->saslconn = NULL;
goto authfail;
@@ -2596,7 +2596,7 @@
cipher = gnutls_cipher_get(client->tlssession);
if (!(ssf = (sasl_ssf_t)gnutls_cipher_get_key_size(cipher))) {
- qemudLog(QEMUD_ERR, "%s", _("cannot TLS get cipher size"));
+ ERROR0(_("cannot TLS get cipher size"));
sasl_dispose(&client->saslconn);
client->saslconn = NULL;
goto authfail;
@@ -2605,7 +2605,7 @@
err = sasl_setprop(client->saslconn, SASL_SSF_EXTERNAL, &ssf);
if (err != SASL_OK) {
- qemudLog(QEMUD_ERR, _("cannot set SASL external SSF %d (%s)"),
+ ERROR(_("cannot set SASL external SSF %d (%s)"),
err, sasl_errstring(err, NULL, NULL));
sasl_dispose(&client->saslconn);
client->saslconn = NULL;
@@ -2633,7 +2633,7 @@
err = sasl_setprop(client->saslconn, SASL_SEC_PROPS, &secprops);
if (err != SASL_OK) {
- qemudLog(QEMUD_ERR, _("cannot set SASL security props %d (%s)"),
+ ERROR(_("cannot set SASL security props %d (%s)"),
err, sasl_errstring(err, NULL, NULL));
sasl_dispose(&client->saslconn);
client->saslconn = NULL;
@@ -2649,7 +2649,7 @@
NULL,
NULL);
if (err != SASL_OK) {
- qemudLog(QEMUD_ERR, _("cannot list SASL mechanisms %d (%s)"),
+ ERROR(_("cannot list SASL mechanisms %d (%s)"),
err, sasl_errdetail(client->saslconn));
sasl_dispose(&client->saslconn);
client->saslconn = NULL;
@@ -2658,7 +2658,7 @@
REMOTE_DEBUG("Available mechanisms for client: '%s'", mechlist);
ret->mechlist = strdup(mechlist);
if (!ret->mechlist) {
- qemudLog(QEMUD_ERR, "%s", _("cannot allocate mechlist"));
+ ERROR0(_("cannot allocate mechlist"));
sasl_dispose(&client->saslconn);
client->saslconn = NULL;
goto authfail;
@@ -2689,7 +2689,7 @@
err = sasl_getprop(client->saslconn, SASL_SSF, &val);
if (err != SASL_OK) {
- qemudLog(QEMUD_ERR, _("cannot query SASL ssf on connection %d (%s)"),
+ ERROR(_("cannot query SASL ssf on connection %d (%s)"),
err, sasl_errstring(err, NULL, NULL));
remoteDispatchAuthError(rerr);
sasl_dispose(&client->saslconn);
@@ -2699,7 +2699,7 @@
ssf = *(const int *)val;
REMOTE_DEBUG("negotiated an SSF of %d", ssf);
if (ssf < 56) { /* 56 is good for Kerberos */
- qemudLog(QEMUD_ERR, _("negotiated SSF %d was not strong enough"), ssf);
+ ERROR(_("negotiated SSF %d was not strong enough"), ssf);
remoteDispatchAuthError(rerr);
sasl_dispose(&client->saslconn);
client->saslconn = NULL;
@@ -2728,8 +2728,7 @@
err = sasl_getprop(client->saslconn, SASL_USERNAME, &val);
if (err != SASL_OK) {
- qemudLog(QEMUD_ERR,
- _("cannot query SASL username on connection %d (%s)"),
+ ERROR(_("cannot query SASL username on connection %d (%s)"),
err, sasl_errstring(err, NULL, NULL));
remoteDispatchAuthError(rerr);
sasl_dispose(&client->saslconn);
@@ -2737,7 +2736,7 @@
return -1;
}
if (val == NULL) {
- qemudLog(QEMUD_ERR, "%s", _("no client username was found"));
+ ERROR0(_("no client username was found"));
remoteDispatchAuthError(rerr);
sasl_dispose(&client->saslconn);
client->saslconn = NULL;
@@ -2747,7 +2746,7 @@
client->saslUsername = strdup((const char*)val);
if (client->saslUsername == NULL) {
- qemudLog(QEMUD_ERR, "%s", _("out of memory copying username"));
+ ERROR0(_("out of memory copying username"));
remoteDispatchAuthError(rerr);
sasl_dispose(&client->saslconn);
client->saslconn = NULL;
@@ -2766,8 +2765,7 @@
}
/* Denied */
- qemudLog(QEMUD_ERR, _("SASL client %s not allowed in whitelist"),
- client->saslUsername);
+ ERROR(_("SASL client %s not allowed in whitelist"), client->saslUsername);
remoteDispatchAuthError(rerr);
sasl_dispose(&client->saslconn);
client->saslconn = NULL;
@@ -2797,7 +2795,7 @@
REMOTE_DEBUG("Start SASL auth %d", client->fd);
if (client->auth != REMOTE_AUTH_SASL ||
client->saslconn == NULL) {
- qemudLog(QEMUD_ERR, "%s", _("client tried invalid SASL start request"));
+ ERROR0(_("client tried invalid SASL start request"));
goto authfail;
}
@@ -2812,15 +2810,14 @@
&serveroutlen);
if (err != SASL_OK &&
err != SASL_CONTINUE) {
- qemudLog(QEMUD_ERR, _("sasl start failed %d (%s)"),
+ ERROR(_("sasl start failed %d (%s)"),
err, sasl_errdetail(client->saslconn));
sasl_dispose(&client->saslconn);
client->saslconn = NULL;
goto authfail;
}
if (serveroutlen > REMOTE_AUTH_SASL_DATA_MAX) {
- qemudLog(QEMUD_ERR, _("sasl start reply data too long %d"),
- serveroutlen);
+ ERROR(_("sasl start reply data too long %d"), serveroutlen);
sasl_dispose(&client->saslconn);
client->saslconn = NULL;
goto authfail;
@@ -2885,7 +2882,7 @@
REMOTE_DEBUG("Step SASL auth %d", client->fd);
if (client->auth != REMOTE_AUTH_SASL ||
client->saslconn == NULL) {
- qemudLog(QEMUD_ERR, "%s", _("client tried invalid SASL start request"));
+ ERROR0(_("client tried invalid SASL start request"));
goto authfail;
}
@@ -2899,7 +2896,7 @@
&serveroutlen);
if (err != SASL_OK &&
err != SASL_CONTINUE) {
- qemudLog(QEMUD_ERR, _("sasl step failed %d (%s)"),
+ ERROR(_("sasl step failed %d (%s)"),
err, sasl_errdetail(client->saslconn));
sasl_dispose(&client->saslconn);
client->saslconn = NULL;
@@ -2907,7 +2904,7 @@
}
if (serveroutlen > REMOTE_AUTH_SASL_DATA_MAX) {
- qemudLog(QEMUD_ERR, _("sasl step reply data too long %d"),
+ ERROR(_("sasl step reply data too long %d"),
serveroutlen);
sasl_dispose(&client->saslconn);
client->saslconn = NULL;
@@ -3025,30 +3022,26 @@
REMOTE_DEBUG("Start PolicyKit auth %d", client->fd);
if (client->auth != REMOTE_AUTH_POLKIT) {
- qemudLog(QEMUD_ERR,
- "%s", _("client tried invalid PolicyKit init request"));
+ ERROR0(_("client tried invalid PolicyKit init request"));
goto authfail;
}
if (qemudGetSocketIdentity(client->fd, &callerUid, &callerPid) < 0) {
- qemudLog(QEMUD_ERR, "%s", _("cannot get peer socket identity"));
+ ERROR0(_("cannot get peer socket identity"));
goto authfail;
}
- qemudLog(QEMUD_INFO, _("Checking PID %d running as %d"),
- callerPid, callerUid);
+ INFO(_("Checking PID %d running as %d"), callerPid, callerUid);
dbus_error_init(&err);
if (!(pkcaller = polkit_caller_new_from_pid(server->sysbus,
callerPid, &err))) {
- qemudLog(QEMUD_ERR, _("Failed to lookup policy kit caller: %s"),
- err.message);
+ ERROR(_("Failed to lookup policy kit caller: %s"), err.message);
dbus_error_free(&err);
goto authfail;
}
if (!(pkaction = polkit_action_new())) {
- qemudLog(QEMUD_ERR, _("Failed to create polkit action %s\n"),
- strerror(errno));
+ ERROR(_("Failed to create polkit action %s\n"), strerror(errno));
polkit_caller_unref(pkcaller);
goto authfail;
}
@@ -3056,7 +3049,7 @@
if (!(pkcontext = polkit_context_new()) ||
!polkit_context_init(pkcontext, &pkerr)) {
- qemudLog(QEMUD_ERR, _("Failed to create polkit context %s\n"),
+ ERROR(_("Failed to create polkit context %s\n"),
(pkerr ? polkit_error_get_error_message(pkerr)
: strerror(errno)));
if (pkerr)
@@ -3074,8 +3067,7 @@
0,
&pkerr);
if (pkerr && polkit_error_is_set(pkerr)) {
- qemudLog(QEMUD_ERR,
- _("Policy kit failed to check authorization %d %s"),
+ ERROR(_("Policy kit failed to check authorization %d %s"),
polkit_error_get_error_code(pkerr),
polkit_error_get_error_message(pkerr));
goto authfail;
@@ -3089,15 +3081,12 @@
polkit_caller_unref(pkcaller);
polkit_action_unref(pkaction);
if (pkresult != POLKIT_RESULT_YES) {
- qemudLog(QEMUD_ERR,
- _("Policy kit denied action %s from pid %d, uid %d,"
- " result: %s\n"),
+ ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %s\n"),
action, callerPid, callerUid,
polkit_result_to_string_representation(pkresult));
goto authfail;
}
- qemudLog(QEMUD_INFO,
- _("Policy allowed action %s from pid %d, uid %d, result %s"),
+ INFO(_("Policy allowed action %s from pid %d, uid %d, result %s"),
action, callerPid, callerUid,
polkit_result_to_string_representation(pkresult));
ret->complete = 1;
@@ -3122,8 +3111,7 @@
void *args ATTRIBUTE_UNUSED,
remote_auth_polkit_ret *ret ATTRIBUTE_UNUSED)
{
- qemudLog(QEMUD_ERR,
- "%s", _("client tried unsupported PolicyKit init request"));
+ ERROR0(_("client tried unsupported PolicyKit init request"));
remoteDispatchAuthError(rerr);
return -1;
}
@@ -3145,8 +3133,8 @@
{
if (args->maxnames > REMOTE_NETWORK_NAME_LIST_MAX) {
- remoteDispatchFormatError (rerr,
- "%s", _("maxnames > REMOTE_NETWORK_NAME_LIST_MAX"));
+ remoteDispatchFormatError (rerr, "%s",
+ _("maxnames > REMOTE_NETWORK_NAME_LIST_MAX"));
return -1;
}
--
Libvir-list mailing list
Libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list