misc compile fixes for tools on Solaris
PATCH 1/1 misc compile fixes for tools on Solaris
# HG changeset patch
# User [email protected]
# Date 1161090738 25200
# Node ID 74d0bc37ec06da88b0c38a1c34c8cc95bc28bdbd # Parent 7a86cb5bb6b6e9164bec378b5fb0a270625a2452 A couple of simple compile fixes for tools/ on Solaris.
Signed-off-by John Levon <[email protected]>
config/Linux.mk +1 -0
@@ -21,6 +21,7 @@ LIB64DIR=lib64 LIB64DIR=lib64 SOCKET_LIBS = +CURSES_LIB = -lncurses SONAME_LDFLAG = -Wl,-soname SHLIB_FLAGS = -shared
config/SunOS.mk +1 -0
@@ -22,6 +22,7 @@ LIB64DIR=lib/amd64 LIB64DIR=lib/amd64 SOCKET_LIBS = -lsocket +CURSES_LIB = -lcurses SONAME_LDFLAG = -Wl,-h SHLIB_FLAGS = -static-libgcc -shared
tools/console/daemon/io.c +1 -1
@@ -147,7 +147,7 @@ static int domain_create_tty(struct domaint master;bool success; -if ((master =getpt ()) ==-1 || +if ((master =open ("/dev/ptmx" ,O_RDWR |O_NOCTTY )) ==-1 ||grantpt (master) ==-1 ||unlockpt (master) ==-1 ) {dolog (LOG_ERR ,"Failed to create tty for domain-%d" , dom->domid);
tools/console/daemon/utils.c +1 -1
@@ -95,7 +95,7 @@ void daemonize(const char *pidfile)exit (1 ); } - len =sprintf (buf,"%d\n" ,getpid ()); + len =sprintf (buf,"%ld\n" , (long )getpid ());if (write (fd, buf, len) <0 )exit (1 );
tools/ioemu/vl.c +3 -3
@@ -3028,7 +3028,7 @@ void net_slirp_smb(const char *exported_ }/* XXX: better tmp dir construction */ -snprintf (smb_dir,sizeof (smb_dir),"/tmp/qemu-smb.%d" ,getpid ()); +snprintf (smb_dir,sizeof (smb_dir),"/tmp/qemu-smb.%ld" , (long )getpid ());if (mkdir (smb_dir,0700 ) <0 ) {fprintf (stderr,"qemu: could not create samba server dir '%s'\n" , smb_dir);exit (1 );
@@ -3995,7 +3995,7 @@ static void create_pidfile(const char *fperror ("Opening pidfile" );exit (1 ); } -fprintf (f,"%d\n" ,getpid ()); +fprintf (f,"%ld\n" , (long )getpid ());fclose (f); pid_filename =qemu_strdup (filename);if (!pid_filename) {
@@ -5942,7 +5942,7 @@ int main(int argc, char **argv)memset (&vnclisten_addr.sin_addr,0 ,sizeof (vnclisten_addr.sin_addr));/* init debug */ -sprintf (qemu_dm_logfilename,"/var/log/xen/qemu-dm.%d.log" ,getpid ()); +sprintf (qemu_dm_logfilename,"/var/log/xen/qemu-dm.%ld.log" , (long )getpid ());cpu_set_log_filename (qemu_dm_logfilename);cpu_set_log (0 );
tools/libxc/xg_private.c +1 -0
@@ -7,6 +7,7 @@#include <stdlib.h> #include <unistd.h> #include <zlib.h> +#include <strings.h> #include "xg_private.h"
tools/xcutils/readnotes.c +4 -2
@@ -56,7 +56,8 @@ static void print_numeric_note(const cha prefix, *(uint64_t *)ELFNOTE_DESC(note));break ;default : -printf ("%s: unknown data size %#x\n" , prefix, note->n_descsz); +printf ("%s: unknown data size %#x\n" , prefix, + (unsigned int )note->n_descsz);break ; } }
@@ -301,7 +302,8 @@ int main(int argc, char **argv)print_string_note ("FEATURES" , note);break ;default : -printf ("unknown note type %#x\n" , note->n_type); +printf ("unknown note type %#x\n" , + (unsigned int )note->n_type);break ; } }
tools/xenstat/xentop/Makefile +2 -1
@@ -25,7 +25,7 @@ sbindir=$(prefix)/sbin CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT) LDFLAGS += -L$(XEN_LIBXENSTAT) -LDLIBS += -lxenstat -lncurses $(SOCKET_LIBS) +LDLIBS += -lxenstat $(CURSES_LIB) $(SOCKET_LIBS) .PHONY: all all: xentop
@@ -33,6 +33,7 @@ all: xentop .PHONY: install install: xentop xentop.1 $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop + $(INSTALL_DIR) $(DESTDIR)$(man1dir) $(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1 endif
tools/xenstat/xentop/xentop.c +5 -2
@@ -23,6 +23,7 @@#include <errno.h> #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #include <string.h> #include <sys/time.h> #include <time.h>
@@ -266,7 +267,7 @@ static void print(const char *fmt, ...)if (!batch) {if ((current_row () <lines ()-1 )) {va_start (args, fmt); -vw_printw (stdscr, fmt, args); +vwprintw (stdscr, (char *)fmt, args);va_end (args); } }else {
@@ -280,7 +281,7 @@ static void attr_addstr(int attr, conststatic void attr_addstr (int attr,const char *str) {attron (attr); -addstr (str); +addstr ((char *)str);attroff (attr); }
@@ -1035,7 +1036,9 @@ int main(int argc, char **argv)nonl ();keypad (stdscr, TRUE);halfdelay (5 ); +#ifndef __sun__use_default_colors (); +#endif init_pair (1 ,-1 ,COLOR_YELLOW ); do {
tools/xenstore/xenstored_core.c +2 -2
@@ -1688,7 +1688,7 @@ static void write_pidfile(const char *piif (lockf (fd,F_TLOCK ,0 ) ==-1 )exit (0 ); - len =sprintf (buf,"%d\n" ,getpid ()); + len =sprintf (buf,"%ld\n" , (long )getpid ());if (write (fd, buf, len) != len)barf_perror ("Writing pid file %s" , pidfile); }
@@ -1901,7 +1901,7 @@ int main(int argc, char *argv[])restore_existing_connections ();if (outputpid) { -printf ("%i\n" ,getpid ()); +printf ("%ld\n" , (long )getpid ());fflush (stdout); }
tools/xenstore/xsls.c +1 -0
@@ -6,6 +6,7 @@#include <getopt.h> #include <unistd.h> #include <sys/ioctl.h> +#include <termios.h> static int max_width =80 ;static int desired_width =60 ;