From 8fcd36920e1b0e5ff92efb16f7ae05112cd4defa Mon Sep 17 00:00:00 2001
From: blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sun, 17 Aug 2008 20:26:25 +0000
Subject: [PATCH] Fix some warnings that would be generated by gcc
-Wmissing-prototypes
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5022 c046a42c-6fe2-441c-8c8c-71466251a162
---
dyngen.c | 50 ++++++++++++++++++++---------------------
exec.c | 2 +-
hw/twl92230.c | 2 +-
hw/usb-serial.c | 6 ++---
linux-user/main.c | 4 +++-
linux-user/signal.c | 5 +++--
linux-user/syscall.c | 34 +++++++++++++++-------------
slirp/slirp.c | 2 +-
tcg/tcg.c | 17 ++------------
tcg/x86_64/tcg-target.c | 4 ++--
vl.c | 2 +-
11 files changed, 61 insertions(+), 67 deletions(-)
diff --git a/dyngen.c b/dyngen.c
index 86c1bb11a2..68f23ad376 100644
--- a/dyngen.c
+++ b/dyngen.c
@@ -272,7 +272,7 @@ static void *load_data(int fd, long offset, unsigned int size)
return data;
}
-int strstart(const char *str, const char *val, const char **ptr)
+static int strstart(const char *str, const char *val, const char **ptr)
{
const char *p, *q;
p = str;
@@ -288,7 +288,7 @@ int strstart(const char *str, const char *val, const char **ptr)
return 1;
}
-void pstrcpy(char *buf, int buf_size, const char *str)
+static void pstrcpy(char *buf, int buf_size, const char *str)
{
int c;
char *q = buf;
@@ -305,32 +305,32 @@ void pstrcpy(char *buf, int buf_size, const char *str)
*q = '\0';
}
-void swab16s(uint16_t *p)
+static void swab16s(uint16_t *p)
{
*p = bswap16(*p);
}
-void swab32s(uint32_t *p)
+static void swab32s(uint32_t *p)
{
*p = bswap32(*p);
}
-void swab32ss(int32_t *p)
+static void swab32ss(int32_t *p)
{
*p = bswap32(*p);
}
-void swab64s(uint64_t *p)
+static void swab64s(uint64_t *p)
{
*p = bswap64(*p);
}
-void swab64ss(int64_t *p)
+static void swab64ss(int64_t *p)
{
*p = bswap64(*p);
}
-uint16_t get16(uint16_t *p)
+static uint16_t get16(uint16_t *p)
{
uint16_t val;
val = *p;
@@ -339,7 +339,7 @@ uint16_t get16(uint16_t *p)
return val;
}
-uint32_t get32(uint32_t *p)
+static uint32_t get32(uint32_t *p)
{
uint32_t val;
val = *p;
@@ -348,14 +348,14 @@ uint32_t get32(uint32_t *p)
return val;
}
-void put16(uint16_t *p, uint16_t val)
+static void put16(uint16_t *p, uint16_t val)
{
if (do_swap)
val = bswap16(val);
*p = val;
}
-void put32(uint32_t *p, uint32_t val)
+static void put32(uint32_t *p, uint32_t val)
{
if (do_swap)
val = bswap32(val);
@@ -378,7 +378,7 @@ uint8_t **sdata;
struct elfhdr ehdr;
char *strtab;
-int elf_must_swap(struct elfhdr *h)
+static int elf_must_swap(struct elfhdr *h)
{
union {
uint32_t i;
@@ -390,7 +390,7 @@ int elf_must_swap(struct elfhdr *h)
(swaptest.b[0] == 0);
}
-void elf_swap_ehdr(struct elfhdr *h)
+static void elf_swap_ehdr(struct elfhdr *h)
{
swab16s(&h->e_type); /* Object file type */
swab16s(&h-> e_machine); /* Architecture */
@@ -407,7 +407,7 @@ void elf_swap_ehdr(struct elfhdr *h)
swab16s(&h-> e_shstrndx); /* Section header string table index */
}
-void elf_swap_shdr(struct elf_shdr *h)
+static void elf_swap_shdr(struct elf_shdr *h)
{
swab32s(&h-> sh_name); /* Section name (string tbl index) */
swab32s(&h-> sh_type); /* Section type */
@@ -421,7 +421,7 @@ void elf_swap_shdr(struct elf_shdr *h)
swabls(&h-> sh_entsize); /* Entry size if section holds table */
}
-void elf_swap_phdr(struct elf_phdr *h)
+static void elf_swap_phdr(struct elf_phdr *h)
{
swab32s(&h->p_type); /* Segment type */
swabls(&h->p_offset); /* Segment file offset */
@@ -433,7 +433,7 @@ void elf_swap_phdr(struct elf_phdr *h)
swabls(&h->p_align); /* Segment alignment */
}
-void elf_swap_rel(ELF_RELOC *rel)
+static void elf_swap_rel(ELF_RELOC *rel)
{
swabls(&rel->r_offset);
swabls(&rel->r_info);
@@ -442,8 +442,8 @@ void elf_swap_rel(ELF_RELOC *rel)
#endif
}
-struct elf_shdr *find_elf_section(struct elf_shdr *shdr, int shnum, const char *shstr,
- const char *name)
+static struct elf_shdr *find_elf_section(struct elf_shdr *shdr, int shnum,
+ const char *shstr, const char *name)
{
int i;
const char *shname;
@@ -460,7 +460,7 @@ struct elf_shdr *find_elf_section(struct elf_shdr *shdr, int shnum, const char *
return NULL;
}
-int find_reloc(int sh_index)
+static int find_reloc(int sh_index)
{
struct elf_shdr *sec;
int i;
@@ -489,7 +489,7 @@ static char *get_sym_name(EXE_SYM *sym)
}
/* load an elf object file */
-int load_object(const char *filename)
+static int load_object(const char *filename)
{
int fd;
struct elf_shdr *sec, *symtab_sec, *strtab_sec, *text_sec;
@@ -1227,7 +1227,7 @@ int load_object(const char *filename)
#endif /* CONFIG_FORMAT_MACH */
/* return true if the expression is a label reference */
-int get_reloc_expr(char *name, int name_size, const char *sym_name)
+static int get_reloc_expr(char *name, int name_size, const char *sym_name)
{
const char *p;
@@ -1294,8 +1294,8 @@ get_plt_index (const char *name, unsigned long addend)
#define MAX_ARGS 3
/* generate op code */
-void gen_code(const char *name, host_ulong offset, host_ulong size,
- FILE *outfile, int gen_switch)
+static void gen_code(const char *name, host_ulong offset, host_ulong size,
+ FILE *outfile, int gen_switch)
{
int copy_size = 0;
uint8_t *p_start, *p_end;
@@ -2630,7 +2630,7 @@ void gen_code(const char *name, host_ulong offset, host_ulong size,
}
}
-int gen_file(FILE *outfile, int out_type)
+static int gen_file(FILE *outfile, int out_type)
{
int i;
EXE_SYM *sym;
@@ -2742,7 +2742,7 @@ int gen_file(FILE *outfile, int out_type)
return 0;
}
-void usage(void)
+static void usage(void)
{
printf("dyngen (c) 2003 Fabrice Bellard\n"
"usage: dyngen [-o outfile] [-c] objfile\n"
diff --git a/exec.c b/exec.c
index 3ab4ad059e..a0aa7dc18a 100644
--- a/exec.c
+++ b/exec.c
@@ -386,7 +386,7 @@ static void tlb_unprotect_code_phys(CPUState *env, ram_addr_t ram_addr,
static uint8_t static_code_gen_buffer[DEFAULT_CODE_GEN_BUFFER_SIZE];
#endif
-void code_gen_alloc(unsigned long tb_size)
+static void code_gen_alloc(unsigned long tb_size)
{
#ifdef USE_STATIC_CODE_GEN_BUFFER
code_gen_buffer = static_code_gen_buffer;
diff --git a/hw/twl92230.c b/hw/twl92230.c
index 8fad96902d..ad49eac0d8 100644
--- a/hw/twl92230.c
+++ b/hw/twl92230.c
@@ -129,7 +129,7 @@ static void menelaus_rtc_hz(void *opaque)
menelaus_update(s);
}
-void menelaus_reset(i2c_slave *i2c)
+static void menelaus_reset(i2c_slave *i2c)
{
struct menelaus_s *s = (struct menelaus_s *) i2c;
s->reg = 0x00;
diff --git a/hw/usb-serial.c b/hw/usb-serial.c
index 10772f36cd..92d6dfdd42 100644
--- a/hw/usb-serial.c
+++ b/hw/usb-serial.c
@@ -483,13 +483,13 @@ static void usb_serial_handle_destroy(USBDevice *dev)
qemu_free(s);
}
-int usb_serial_can_read(void *opaque)
+static int usb_serial_can_read(void *opaque)
{
USBSerialState *s = opaque;
return RECV_BUF - s->recv_used;
}
-void usb_serial_read(void *opaque, const uint8_t *buf, int size)
+static void usb_serial_read(void *opaque, const uint8_t *buf, int size)
{
USBSerialState *s = opaque;
int first_size = RECV_BUF - s->recv_ptr;
@@ -501,7 +501,7 @@ void usb_serial_read(void *opaque, const uint8_t *buf, int size)
s->recv_used += size;
}
-void usb_serial_event(void *opaque, int event)
+static void usb_serial_event(void *opaque, int event)
{
USBSerialState *s = opaque;
diff --git a/linux-user/main.c b/linux-user/main.c
index 023aac33c3..11e9be84b2 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -107,10 +107,12 @@ int cpu_inl(CPUState *env, int addr)
return 0;
}
+#if defined(TARGET_I386)
int cpu_get_pic_interrupt(CPUState *env)
{
return -1;
}
+#endif
/* timers for rdtsc */
@@ -2151,7 +2153,7 @@ void cpu_loop (CPUState *env)
}
#endif /* TARGET_ALPHA */
-void usage(void)
+static void usage(void)
{
printf("qemu-" TARGET_ARCH " version " QEMU_VERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n"
"usage: qemu-" TARGET_ARCH " [options] program [arguments...]\n"
diff --git a/linux-user/signal.c b/linux-user/signal.c
index af40238b2b..8fb3469cca 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -154,7 +154,8 @@ void host_to_target_sigset(target_sigset_t *d, const sigset_t *s)
d->sig[i] = tswapl(d1.sig[i]);
}
-void target_to_host_sigset_internal(sigset_t *d, const target_sigset_t *s)
+static void target_to_host_sigset_internal(sigset_t *d,
+ const target_sigset_t *s)
{
int i;
sigemptyset(d);
@@ -324,7 +325,7 @@ static inline void free_sigqueue(CPUState *env, struct sigqueue *q)
}
/* abort execution with signal */
-void __attribute((noreturn)) force_sig(int sig)
+static void __attribute((noreturn)) force_sig(int sig)
{
int host_sig;
host_sig = target_to_host_signal(sig);
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index c1cfe801cb..fd4890ed7b 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -105,38 +105,38 @@
#undef _syscall6
#define _syscall0(type,name) \
-type name (void) \
+static type name (void) \
{ \
return syscall(__NR_##name); \
}
#define _syscall1(type,name,type1,arg1) \
-type name (type1 arg1) \
+static type name (type1 arg1) \
{ \
return syscall(__NR_##name, arg1); \
}
#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name (type1 arg1,type2 arg2) \
+static type name (type1 arg1,type2 arg2) \
{ \
return syscall(__NR_##name, arg1, arg2); \
}
#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name (type1 arg1,type2 arg2,type3 arg3) \
+static type name (type1 arg1,type2 arg2,type3 arg3) \
{ \
return syscall(__NR_##name, arg1, arg2, arg3); \
}
#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4) \
+static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4) \
{ \
return syscall(__NR_##name, arg1, arg2, arg3, arg4); \
}
#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
type5,arg5) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
+static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
{ \
return syscall(__NR_##name, arg1, arg2, arg3, arg4, arg5); \
}
@@ -144,7 +144,8 @@ type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
type5,arg5,type6,arg6) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,type6 arg6) \
+static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \
+ type6 arg6) \
{ \
return syscall(__NR_##name, arg1, arg2, arg3, arg4, arg5, arg6); \
}
@@ -204,8 +205,10 @@ _syscall3(int, sys_getdents, uint, fd, struct dirent *, dirp, uint, count);
_syscall3(int, sys_getdents64, uint, fd, struct dirent64 *, dirp, uint, count);
#endif
_syscall2(int, sys_getpriority, int, which, int, who);
+#if !defined (__x86_64__)
_syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo,
loff_t *, res, uint, wh);
+#endif
#if defined(TARGET_NR_linkat) && defined(__NR_linkat)
_syscall5(int,sys_linkat,int,olddirfd,const char *,oldpath,
int,newdirfd,const char *,newpath,int,flags)
@@ -253,10 +256,11 @@ _syscall3(int,sys_unlinkat,int,dirfd,const char *,pathname,int,flags)
_syscall4(int,sys_utimensat,int,dirfd,const char *,pathname,
const struct timespec *,tsp,int,flags)
#endif
+#if defined(USE_NPTL)
#if defined(TARGET_NR_futex) && defined(__NR_futex)
_syscall6(int,sys_futex,int *,uaddr,int,op,int,val,
const struct timespec *,timeout,int *,uaddr2,int,val3)
-
+#endif
#endif
extern int personality(int);
@@ -2522,8 +2526,8 @@ install:
}
/* specific and weird i386 syscalls */
-abi_long do_modify_ldt(CPUX86State *env, int func, abi_ulong ptr,
- unsigned long bytecount)
+static abi_long do_modify_ldt(CPUX86State *env, int func, abi_ulong ptr,
+ unsigned long bytecount)
{
abi_long ret;
@@ -2544,7 +2548,7 @@ abi_long do_modify_ldt(CPUX86State *env, int func, abi_ulong ptr,
return ret;
}
-abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr)
+static abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr)
{
uint64_t *gdt_table = g2h(env->gdt.base);
struct target_modify_ldt_ldt_s ldt_info;
@@ -2629,7 +2633,7 @@ install:
return 0;
}
-abi_long do_get_thread_area(CPUX86State *env, abi_ulong ptr)
+static abi_long do_get_thread_area(CPUX86State *env, abi_ulong ptr)
{
struct target_modify_ldt_ldt_s *target_ldt_info;
uint64_t *gdt_table = g2h(env->gdt.base);
@@ -2677,7 +2681,7 @@ abi_long do_get_thread_area(CPUX86State *env, abi_ulong ptr)
}
#ifndef TARGET_ABI32
-abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr)
+static abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr)
{
abi_long ret;
abi_ulong val;
@@ -3150,8 +3154,8 @@ static inline abi_long host_to_target_timespec(abi_ulong target_addr,
futexes locally would make futexes shared between multiple processes
tricky. However they're probably useless because guest atomic
operations won't work either. */
-int do_futex(target_ulong uaddr, int op, int val, target_ulong timeout,
- target_ulong uaddr2, int val3)
+static int do_futex(target_ulong uaddr, int op, int val, target_ulong timeout,
+ target_ulong uaddr2, int val3)
{
struct timespec ts, *pts;
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 303f4825cd..158fd7dbd6 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -554,7 +554,7 @@ struct arphdr
unsigned char ar_tip[4]; /* target IP address */
};
-void arp_input(const uint8_t *pkt, int pkt_len)
+static void arp_input(const uint8_t *pkt, int pkt_len)
{
struct ethhdr *eh = (struct ethhdr *)pkt;
struct arphdr *ah = (struct arphdr *)(pkt + ETH_HLEN);
diff --git a/tcg/tcg.c b/tcg/tcg.c
index e976054110..8c1408c4da 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -196,19 +196,6 @@ void tcg_pool_reset(TCGContext *s)
s->pool_current = NULL;
}
-/* free all the pool */
-void tcg_pool_free(TCGContext *s)
-{
- TCGPool *p, *p1;
-
- for(p = s->pool_first; p != NULL; p = p1) {
- p1 = p->next;
- qemu_free(p);
- }
- s->pool_first = NULL;
- s->pool_cur = s->pool_end = NULL;
-}
-
void tcg_context_init(TCGContext *s)
{
int op, total_args, n;
@@ -655,7 +642,7 @@ void tcg_gen_shifti_i64(TCGv ret, TCGv arg1,
}
#endif
-void tcg_reg_alloc_start(TCGContext *s)
+static void tcg_reg_alloc_start(TCGContext *s)
{
int i;
TCGTemp *ts;
@@ -1025,7 +1012,7 @@ static inline void tcg_la_bb_end(TCGContext *s, uint8_t *dead_temps)
/* Liveness analysis : update the opc_dead_iargs array to tell if a
given input arguments is dead. Instructions updating dead
temporaries are removed. */
-void tcg_liveness_analysis(TCGContext *s)
+static void tcg_liveness_analysis(TCGContext *s)
{
int i, op_index, op, nb_args, nb_iargs, nb_oargs, arg, nb_ops;
TCGArg *args;
diff --git a/tcg/x86_64/tcg-target.c b/tcg/x86_64/tcg-target.c
index 168faabeec..bc5694a8ca 100644
--- a/tcg/x86_64/tcg-target.c
+++ b/tcg/x86_64/tcg-target.c
@@ -108,7 +108,7 @@ static inline int tcg_target_get_call_iarg_regs_count(int flags)
}
/* parse target specific constraints */
-int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)
+static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)
{
const char *ct_str;
@@ -404,7 +404,7 @@ static inline void tgen_arithi64(TCGContext *s, int c, int r0, int64_t val)
}
}
-void tcg_out_addi(TCGContext *s, int reg, tcg_target_long val)
+static void tcg_out_addi(TCGContext *s, int reg, tcg_target_long val)
{
if (val != 0)
tgen_arithi64(s, ARITH_ADD, reg, val);
diff --git a/vl.c b/vl.c
index 0d6343f1b4..281d067bc6 100644
--- a/vl.c
+++ b/vl.c
@@ -2561,7 +2561,7 @@ static void pty_chr_state(CharDriverState *chr, int connected)
}
}
-void pty_chr_timer(void *opaque)
+static void pty_chr_timer(void *opaque)
{
struct CharDriverState *chr = opaque;
PtyCharDriver *s = chr->opaque;
--
2.30.2