Fix some XS9 warnings (#6066)

Fix a warning reported by newer systemd as well as a build warning I noticed when building with a newer GCC.
xapi-project · Nov 6, 2024 · 3d3bd23 · 3d3bd23
2 parents baf7cbd + e3f9213
commit 3d3bd23
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 6 deletions.
diff --git a/ocaml/forkexecd/lib/fe_systemctl.ml b/ocaml/forkexecd/lib/fe_systemctl.ml
@@ -60,8 +60,6 @@ let start_transient ?(env = Array.of_list default_env) ?(properties = [])
          )
        ; ("SyslogIdentifier", syslog_key)
        ; ("SyslogLevel", "debug")
-       ; ("StandardOutput", "syslog")
-       ; ("StandardError", "inherit")
        ; ("StartLimitInterval", "0") (* no rate-limit, for bootstorms *)
        ; ("ExecStart", String.concat " " (cmd :: List.map Filename.quote args))
        ; ("Type", Type.to_string exec_ty)

diff --git a/ocaml/libs/xapi-stdext/lib/xapi-stdext-zerocheck/zerocheck_stub.c b/ocaml/libs/xapi-stdext/lib/xapi-stdext-zerocheck/zerocheck_stub.c
@@ -31,7 +31,7 @@ value is_all_zeros(value string, value length)
 	for (i = len / 4; i > 0; i--)
 		if (*p++ != 0)
 			goto notallzero;
-	s = (unsigned char *) p;
+	s = (const char *) p;
 	for (i = 0; i < len % 4; i++)
 		if (s[i] != 0)
 			goto notallzero;

diff --git a/scripts/varstored-guard.service b/scripts/varstored-guard.service
@@ -10,8 +10,6 @@ PartOf=toolstack.target
 Type=simple
 Environment=OCAMLRUNPARAM=b
 ExecStart=/usr/sbin/varstored-guard
-# Needed to ensure exceptions are logged when the program fails:
-StandardError=syslog
 LimitNOFILE=4096
 # restart but fail if more than 5 failures in 30s
 Restart=on-failure

diff --git a/scripts/xapi-nbd.service b/scripts/xapi-nbd.service
@@ -11,7 +11,6 @@ Environment=OCAMLRUNPARAM=b
 # and the PathExists in xapi-nbd.path: any change must be made in all three files.
 ExecStart=/usr/sbin/xapi-nbd --certfile=/etc/xensource/xapi-ssl.pem
 StandardOutput=null
-StandardError=syslog
 # restart but fail if more than 5 failures in 2s
 Restart=on-failure
 StartLimitBurst=5