intc: Unexport InterruptStatsProviderClass-related functions

[PATCH] intc: Unexport InterruptStatsProviderClass-related functions

Posted by Bernhard Beschow 2 years, 3 months ago

The functions are only used within their respective source files, so no
need for exporting.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 hw/intc/i8259_common.c            | 6 +++---
 hw/intc/ioapic_common.c           | 2 +-
 include/hw/i386/ioapic_internal.h | 1 -
 include/hw/isa/i8259_internal.h   | 3 ---
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c
index d90b40fe4c..af2e4a2241 100644
--- a/hw/intc/i8259_common.c
+++ b/hw/intc/i8259_common.c
@@ -116,8 +116,8 @@ void pic_stat_update_irq(int irq, int level)
     }
 }
 
-bool pic_get_statistics(InterruptStatsProvider *obj,
-                        uint64_t **irq_counts, unsigned int *nb_irqs)
+static bool pic_get_statistics(InterruptStatsProvider *obj,
+                               uint64_t **irq_counts, unsigned int *nb_irqs)
 {
     PICCommonState *s = PIC_COMMON(obj);
 
@@ -132,7 +132,7 @@ bool pic_get_statistics(InterruptStatsProvider *obj,
     return true;
 }
 
-void pic_print_info(InterruptStatsProvider *obj, Monitor *mon)
+static void pic_print_info(InterruptStatsProvider *obj, Monitor *mon)
 {
     PICCommonState *s = PIC_COMMON(obj);
 
diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c
index 3cccfc1556..aa5f760871 100644
--- a/hw/intc/ioapic_common.c
+++ b/hw/intc/ioapic_common.c
@@ -76,7 +76,7 @@ static void ioapic_irr_dump(Monitor *mon, const char *name, uint32_t bitmap)
     monitor_printf(mon, "\n");
 }
 
-void ioapic_print_redtbl(Monitor *mon, IOAPICCommonState *s)
+static void ioapic_print_redtbl(Monitor *mon, IOAPICCommonState *s)
 {
     static const char *delm_str[] = {
         "fixed", "lowest", "SMI", "...", "NMI", "INIT", "...", "extINT"};
diff --git a/include/hw/i386/ioapic_internal.h b/include/hw/i386/ioapic_internal.h
index 021e715f11..9880443cc7 100644
--- a/include/hw/i386/ioapic_internal.h
+++ b/include/hw/i386/ioapic_internal.h
@@ -112,7 +112,6 @@ struct IOAPICCommonState {
 
 void ioapic_reset_common(DeviceState *dev);
 
-void ioapic_print_redtbl(Monitor *mon, IOAPICCommonState *s);
 void ioapic_stat_update_irq(IOAPICCommonState *s, int irq, int level);
 
 #endif /* QEMU_IOAPIC_INTERNAL_H */
diff --git a/include/hw/isa/i8259_internal.h b/include/hw/isa/i8259_internal.h
index a6ae8a583f..d272d879fb 100644
--- a/include/hw/isa/i8259_internal.h
+++ b/include/hw/isa/i8259_internal.h
@@ -72,8 +72,5 @@ struct PICCommonState {
 void pic_reset_common(PICCommonState *s);
 ISADevice *i8259_init_chip(const char *name, ISABus *bus, bool master);
 void pic_stat_update_irq(int irq, int level);
-bool pic_get_statistics(InterruptStatsProvider *obj,
-                        uint64_t **irq_counts, unsigned int *nb_irqs);
-void pic_print_info(InterruptStatsProvider *obj, Monitor *mon);
 
 #endif /* QEMU_I8259_INTERNAL_H */
-- 
2.34.1

Re: [PATCH] intc: Unexport InterruptStatsProviderClass-related functions

Posted by Philippe Mathieu-Daudé via 2 years, 3 months ago

On 16/1/22 13:23, Bernhard Beschow wrote:
> The functions are only used within their respective source files, so no
> need for exporting.
> 
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   hw/intc/i8259_common.c            | 6 +++---
>   hw/intc/ioapic_common.c           | 2 +-
>   include/hw/i386/ioapic_internal.h | 1 -
>   include/hw/isa/i8259_internal.h   | 3 ---
>   4 files changed, 4 insertions(+), 8 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Re: [PATCH] intc: Unexport InterruptStatsProviderClass-related functions

Posted by Paolo Bonzini 2 years, 3 months ago

On 1/16/22 13:23, Bernhard Beschow wrote:
> The functions are only used within their respective source files, so no
> need for exporting.
> 
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   hw/intc/i8259_common.c            | 6 +++---
>   hw/intc/ioapic_common.c           | 2 +-
>   include/hw/i386/ioapic_internal.h | 1 -
>   include/hw/isa/i8259_internal.h   | 3 ---
>   4 files changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c
> index d90b40fe4c..af2e4a2241 100644
> --- a/hw/intc/i8259_common.c
> +++ b/hw/intc/i8259_common.c
> @@ -116,8 +116,8 @@ void pic_stat_update_irq(int irq, int level)
>       }
>   }
>   
> -bool pic_get_statistics(InterruptStatsProvider *obj,
> -                        uint64_t **irq_counts, unsigned int *nb_irqs)
> +static bool pic_get_statistics(InterruptStatsProvider *obj,
> +                               uint64_t **irq_counts, unsigned int *nb_irqs)
>   {
>       PICCommonState *s = PIC_COMMON(obj);
>   
> @@ -132,7 +132,7 @@ bool pic_get_statistics(InterruptStatsProvider *obj,
>       return true;
>   }
>   
> -void pic_print_info(InterruptStatsProvider *obj, Monitor *mon)
> +static void pic_print_info(InterruptStatsProvider *obj, Monitor *mon)
>   {
>       PICCommonState *s = PIC_COMMON(obj);
>   
> diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c
> index 3cccfc1556..aa5f760871 100644
> --- a/hw/intc/ioapic_common.c
> +++ b/hw/intc/ioapic_common.c
> @@ -76,7 +76,7 @@ static void ioapic_irr_dump(Monitor *mon, const char *name, uint32_t bitmap)
>       monitor_printf(mon, "\n");
>   }
>   
> -void ioapic_print_redtbl(Monitor *mon, IOAPICCommonState *s)
> +static void ioapic_print_redtbl(Monitor *mon, IOAPICCommonState *s)
>   {
>       static const char *delm_str[] = {
>           "fixed", "lowest", "SMI", "...", "NMI", "INIT", "...", "extINT"};
> diff --git a/include/hw/i386/ioapic_internal.h b/include/hw/i386/ioapic_internal.h
> index 021e715f11..9880443cc7 100644
> --- a/include/hw/i386/ioapic_internal.h
> +++ b/include/hw/i386/ioapic_internal.h
> @@ -112,7 +112,6 @@ struct IOAPICCommonState {
>   
>   void ioapic_reset_common(DeviceState *dev);
>   
> -void ioapic_print_redtbl(Monitor *mon, IOAPICCommonState *s);
>   void ioapic_stat_update_irq(IOAPICCommonState *s, int irq, int level);
>   
>   #endif /* QEMU_IOAPIC_INTERNAL_H */
> diff --git a/include/hw/isa/i8259_internal.h b/include/hw/isa/i8259_internal.h
> index a6ae8a583f..d272d879fb 100644
> --- a/include/hw/isa/i8259_internal.h
> +++ b/include/hw/isa/i8259_internal.h
> @@ -72,8 +72,5 @@ struct PICCommonState {
>   void pic_reset_common(PICCommonState *s);
>   ISADevice *i8259_init_chip(const char *name, ISABus *bus, bool master);
>   void pic_stat_update_irq(int irq, int level);
> -bool pic_get_statistics(InterruptStatsProvider *obj,
> -                        uint64_t **irq_counts, unsigned int *nb_irqs);
> -void pic_print_info(InterruptStatsProvider *obj, Monitor *mon);
>   
>   #endif /* QEMU_I8259_INTERNAL_H */

Queued, thanks.

Paolo

Re: [PATCH] intc: Unexport InterruptStatsProviderClass-related functions

Posted by Michael S. Tsirkin 2 years, 3 months ago

On Sun, Jan 16, 2022 at 01:23:26PM +0100, Bernhard Beschow wrote:
> The functions are only used within their respective source files, so no
> need for exporting.
> 
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>

Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  hw/intc/i8259_common.c            | 6 +++---
>  hw/intc/ioapic_common.c           | 2 +-
>  include/hw/i386/ioapic_internal.h | 1 -
>  include/hw/isa/i8259_internal.h   | 3 ---
>  4 files changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c
> index d90b40fe4c..af2e4a2241 100644
> --- a/hw/intc/i8259_common.c
> +++ b/hw/intc/i8259_common.c
> @@ -116,8 +116,8 @@ void pic_stat_update_irq(int irq, int level)
>      }
>  }
>  
> -bool pic_get_statistics(InterruptStatsProvider *obj,
> -                        uint64_t **irq_counts, unsigned int *nb_irqs)
> +static bool pic_get_statistics(InterruptStatsProvider *obj,
> +                               uint64_t **irq_counts, unsigned int *nb_irqs)
>  {
>      PICCommonState *s = PIC_COMMON(obj);
>  
> @@ -132,7 +132,7 @@ bool pic_get_statistics(InterruptStatsProvider *obj,
>      return true;
>  }
>  
> -void pic_print_info(InterruptStatsProvider *obj, Monitor *mon)
> +static void pic_print_info(InterruptStatsProvider *obj, Monitor *mon)
>  {
>      PICCommonState *s = PIC_COMMON(obj);
>  
> diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c
> index 3cccfc1556..aa5f760871 100644
> --- a/hw/intc/ioapic_common.c
> +++ b/hw/intc/ioapic_common.c
> @@ -76,7 +76,7 @@ static void ioapic_irr_dump(Monitor *mon, const char *name, uint32_t bitmap)
>      monitor_printf(mon, "\n");
>  }
>  
> -void ioapic_print_redtbl(Monitor *mon, IOAPICCommonState *s)
> +static void ioapic_print_redtbl(Monitor *mon, IOAPICCommonState *s)
>  {
>      static const char *delm_str[] = {
>          "fixed", "lowest", "SMI", "...", "NMI", "INIT", "...", "extINT"};
> diff --git a/include/hw/i386/ioapic_internal.h b/include/hw/i386/ioapic_internal.h
> index 021e715f11..9880443cc7 100644
> --- a/include/hw/i386/ioapic_internal.h
> +++ b/include/hw/i386/ioapic_internal.h
> @@ -112,7 +112,6 @@ struct IOAPICCommonState {
>  
>  void ioapic_reset_common(DeviceState *dev);
>  
> -void ioapic_print_redtbl(Monitor *mon, IOAPICCommonState *s);
>  void ioapic_stat_update_irq(IOAPICCommonState *s, int irq, int level);
>  
>  #endif /* QEMU_IOAPIC_INTERNAL_H */
> diff --git a/include/hw/isa/i8259_internal.h b/include/hw/isa/i8259_internal.h
> index a6ae8a583f..d272d879fb 100644
> --- a/include/hw/isa/i8259_internal.h
> +++ b/include/hw/isa/i8259_internal.h
> @@ -72,8 +72,5 @@ struct PICCommonState {
>  void pic_reset_common(PICCommonState *s);
>  ISADevice *i8259_init_chip(const char *name, ISABus *bus, bool master);
>  void pic_stat_update_irq(int irq, int level);
> -bool pic_get_statistics(InterruptStatsProvider *obj,
> -                        uint64_t **irq_counts, unsigned int *nb_irqs);
> -void pic_print_info(InterruptStatsProvider *obj, Monitor *mon);
>  
>  #endif /* QEMU_I8259_INTERNAL_H */
> -- 
> 2.34.1