[Qemu-devel] [PATCH 0/3] remove unused functions

[Qemu-devel] [PATCH 0/3] remove unused functions

[Blue Swirl]

Remove some unused functions.

Blue Swirl (3):
  m48t59: remove unused m48t59_set_addr
  sun4c: remove unused functions
  slirp: remove unused function u_sleep

 hw/m48t59.c       |    7 -------
 hw/nvram.h        |    1 -
 hw/sun4c_intctl.c |   23 -----------------------
 hw/sun4m.h        |    4 ----
 slirp/misc.c      |   14 --------------
 slirp/misc.h      |    1 -
 6 files changed, 0 insertions(+), 50 deletions(-)

-- 
1.7.2.5

[Qemu-devel] [PATCH 1/3] m48t59: remove unused m48t59_set_addr

[Blue Swirl]

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 hw/m48t59.c |    7 -------
 hw/nvram.h  |    1 -
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/hw/m48t59.c b/hw/m48t59.c
index 9eb1a09..058d6e7 100644
--- a/hw/m48t59.c
+++ b/hw/m48t59.c
@@ -466,13 +466,6 @@ uint32_t m48t59_read (void *opaque, uint32_t addr)
     return retval;
 }
 
-void m48t59_set_addr (void *opaque, uint32_t addr)
-{
-    M48t59State *NVRAM = opaque;
-
-    NVRAM->addr = addr;
-}
-
 void m48t59_toggle_lock (void *opaque, int lock)
 {
     M48t59State *NVRAM = opaque;
diff --git a/hw/nvram.h b/hw/nvram.h
index 72363ce..59337fa 100644
--- a/hw/nvram.h
+++ b/hw/nvram.h
@@ -30,6 +30,5 @@ M48t59State *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size,
                              int type);
 M48t59State *m48t59_init(qemu_irq IRQ, hwaddr mem_base,
                          uint32_t io_base, uint16_t size, int type);
-void m48t59_set_addr (void *opaque, uint32_t addr);
 
 #endif /* !NVRAM_H */
-- 
1.7.2.5

[Qemu-devel] [PATCH 2/3] sun4c: remove unused functions

[Blue Swirl]

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 hw/sun4c_intctl.c |   23 -----------------------
 hw/sun4m.h        |    4 ----
 2 files changed, 0 insertions(+), 27 deletions(-)

diff --git a/hw/sun4c_intctl.c b/hw/sun4c_intctl.c
index 8cd70ab..702e9f5 100644
--- a/hw/sun4c_intctl.c
+++ b/hw/sun4c_intctl.c
@@ -94,29 +94,6 @@ static const MemoryRegionOps sun4c_intctl_mem_ops = {
     },
 };
 
-void sun4c_pic_info(Monitor *mon, void *opaque)
-{
-    Sun4c_INTCTLState *s = opaque;
-
-    monitor_printf(mon, "master: pending 0x%2.2x, enabled 0x%2.2x\n",
-                   s->pending, s->reg);
-}
-
-void sun4c_irq_info(Monitor *mon, void *opaque)
-{
-#ifndef DEBUG_IRQ_COUNT
-    monitor_printf(mon, "irq statistic code not compiled.\n");
-#else
-    Sun4c_INTCTLState *s = opaque;
-    int64_t count;
-
-    monitor_printf(mon, "IRQ statistics:\n");
-    count = s->irq_count;
-    if (count > 0)
-        monitor_printf(mon, " %" PRId64 "\n", count);
-#endif
-}
-
 static const uint32_t intbit_to_level[] = { 0, 1, 4, 6, 8, 10, 0, 14, };
 
 static void sun4c_check_interrupts(void *opaque)
diff --git a/hw/sun4m.h b/hw/sun4m.h
index a8c3133..47eb945 100644
--- a/hw/sun4m.h
+++ b/hw/sun4m.h
@@ -26,10 +26,6 @@ static inline void sparc_iommu_memory_write(void *opaque,
 void slavio_pic_info(Monitor *mon, DeviceState *dev);
 void slavio_irq_info(Monitor *mon, DeviceState *dev);
 
-/* sun4c_intctl.c */
-void sun4c_pic_info(Monitor *mon, void *opaque);
-void sun4c_irq_info(Monitor *mon, void *opaque);
-
 /* sun4m.c */
 void sun4m_pic_info(Monitor *mon);
 void sun4m_irq_info(Monitor *mon);
-- 
1.7.2.5

[Qemu-devel] [PATCH 3/3] slirp: remove unused function u_sleep

[Blue Swirl]

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 slirp/misc.c |   14 --------------
 slirp/misc.h |    1 -
 2 files changed, 0 insertions(+), 15 deletions(-)

diff --git a/slirp/misc.c b/slirp/misc.c
index 0bee864..664532a 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -253,20 +253,6 @@ void lprint(const char *format, ...)
     va_end(args);
 }
 
-void
-u_sleep(int usec)
-{
-	struct timeval t;
-	fd_set fdset;
-
-	FD_ZERO(&fdset);
-
-	t.tv_sec = 0;
-	t.tv_usec = usec * 1000;
-
-	select(0, &fdset, &fdset, &fdset, &t);
-}
-
 void slirp_connection_info(Slirp *slirp, Monitor *mon)
 {
     const char * const tcpstates[] = {
diff --git a/slirp/misc.h b/slirp/misc.h
index ed40a10..cc36aeb 100644
--- a/slirp/misc.h
+++ b/slirp/misc.h
@@ -64,7 +64,6 @@ void snooze_hup(int);
 void snooze(void);
 void relay(int);
 void add_emu(char *);
-void u_sleep(int);
 void fd_nonblock(int);
 void fd_block(int);
 int rsh_exec(struct socket *, struct socket *, char *, char *, char *);
-- 
1.7.2.5

Re: [Qemu-devel] [PATCH 3/3] slirp: remove unused function u_sleep

[Jan Kiszka]

On 2012-10-28 13:26, Blue Swirl wrote:
> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
> ---
>  slirp/misc.c |   14 --------------
>  slirp/misc.h |    1 -
>  2 files changed, 0 insertions(+), 15 deletions(-)
> 
> diff --git a/slirp/misc.c b/slirp/misc.c
> index 0bee864..664532a 100644
> --- a/slirp/misc.c
> +++ b/slirp/misc.c
> @@ -253,20 +253,6 @@ void lprint(const char *format, ...)
>      va_end(args);
>  }
>  
> -void
> -u_sleep(int usec)
> -{
> -	struct timeval t;
> -	fd_set fdset;
> -
> -	FD_ZERO(&fdset);
> -
> -	t.tv_sec = 0;
> -	t.tv_usec = usec * 1000;
> -
> -	select(0, &fdset, &fdset, &fdset, &t);
> -}
> -
>  void slirp_connection_info(Slirp *slirp, Monitor *mon)
>  {
>      const char * const tcpstates[] = {
> diff --git a/slirp/misc.h b/slirp/misc.h
> index ed40a10..cc36aeb 100644
> --- a/slirp/misc.h
> +++ b/slirp/misc.h
> @@ -64,7 +64,6 @@ void snooze_hup(int);
>  void snooze(void);
>  void relay(int);
>  void add_emu(char *);
> -void u_sleep(int);
>  void fd_nonblock(int);
>  void fd_block(int);
>  int rsh_exec(struct socket *, struct socket *, char *, char *, char *);
> 

It's obviously fine. But wasn't it already merged or accepted for
trivial? Of course, I can take it otherwise.

Jan

-- 
Siemens AG, Corporate Technology, CT RTC ITP SDP-DE
Corporate Competence Center Embedded Linux

Re: [Qemu-devel] [PATCH 3/3] slirp: remove unused function u_sleep

[Blue Swirl]

On Tue, Oct 30, 2012 at 8:31 AM, Jan Kiszka <jan.kiszka@siemens.com> wrote:
> On 2012-10-28 13:26, Blue Swirl wrote:
>> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
>> ---
>>  slirp/misc.c |   14 --------------
>>  slirp/misc.h |    1 -
>>  2 files changed, 0 insertions(+), 15 deletions(-)
>>
>> diff --git a/slirp/misc.c b/slirp/misc.c
>> index 0bee864..664532a 100644
>> --- a/slirp/misc.c
>> +++ b/slirp/misc.c
>> @@ -253,20 +253,6 @@ void lprint(const char *format, ...)
>>      va_end(args);
>>  }
>>
>> -void
>> -u_sleep(int usec)
>> -{
>> -     struct timeval t;
>> -     fd_set fdset;
>> -
>> -     FD_ZERO(&fdset);
>> -
>> -     t.tv_sec = 0;
>> -     t.tv_usec = usec * 1000;
>> -
>> -     select(0, &fdset, &fdset, &fdset, &t);
>> -}
>> -
>>  void slirp_connection_info(Slirp *slirp, Monitor *mon)
>>  {
>>      const char * const tcpstates[] = {
>> diff --git a/slirp/misc.h b/slirp/misc.h
>> index ed40a10..cc36aeb 100644
>> --- a/slirp/misc.h
>> +++ b/slirp/misc.h
>> @@ -64,7 +64,6 @@ void snooze_hup(int);
>>  void snooze(void);
>>  void relay(int);
>>  void add_emu(char *);
>> -void u_sleep(int);
>>  void fd_nonblock(int);
>>  void fd_block(int);
>>  int rsh_exec(struct socket *, struct socket *, char *, char *, char *);
>>
>
> It's obviously fine. But wasn't it already merged or accepted for
> trivial? Of course, I can take it otherwise.

I split the function removals from the rest of the series because of
API considerations, these are not entirely trivial.

>
> Jan
>
> --
> Siemens AG, Corporate Technology, CT RTC ITP SDP-DE
> Corporate Competence Center Embedded Linux