From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Fri, 22 Oct 2010 21:36:42 +0000 (+0200)
Subject: Fix build for SystemTap 1.0
X-Git-Tag: v0.8.5~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbe719feb20ec823084655bcb9d49c88d482e902;p=thirdparty%2Flibvirt.git

Fix build for SystemTap 1.0

With SystemTap 1.0 a part of the generated macros in probes.h
expands to:

volatile __typeof__(((name))) arg2 = (name);

GCC reports an 'invalid initialize' error when name has type
char[]. Therfore, add casts to char* to avoid this.
---

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 8e88d053f4..d3f003ebb6 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -1230,11 +1230,11 @@ remoteCheckCertificate(struct qemud_client *client)
         }
     }
 
-    PROBE(CLIENT_TLS_ALLOW, "fd=%d, name=%s", client->fd, name);
+    PROBE(CLIENT_TLS_ALLOW, "fd=%d, name=%s", client->fd, (char *)name);
     return 0;
 
 authdeny:
-    PROBE(CLIENT_TLS_DENY, "fd=%d, name=%s", client->fd, name);
+    PROBE(CLIENT_TLS_DENY, "fd=%d, name=%s", client->fd, (char *)name);
     return -1;
 
 authfail:
diff --git a/daemon/remote.c b/daemon/remote.c
index 3b72f98ae6..50ccb3b476 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -4223,7 +4223,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server,
         goto authdeny;
     }
     PROBE(CLIENT_AUTH_ALLOW, "fd=%d, auth=%d, username=%s",
-          client->fd, REMOTE_AUTH_POLKIT, ident);
+          client->fd, REMOTE_AUTH_POLKIT, (char *)ident);
     VIR_INFO(_("Policy allowed action %s from pid %d, uid %d"),
              action, callerPid, callerUid);
     ret->complete = 1;
@@ -4238,7 +4238,7 @@ authfail:
 
 authdeny:
     PROBE(CLIENT_AUTH_DENY, "fd=%d, auth=%d, username=%s",
-          client->fd, REMOTE_AUTH_POLKIT, ident);
+          client->fd, REMOTE_AUTH_POLKIT, (char *)ident);
     goto error;
 
 error: