Skip to contentSkip to conversation

intc: Unexport InterruptStatsProviderClass-related functions

PATCH Applied Bernhard Beschow 4 participants 4 messages Jan 16, 2022 – Jan 17, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 intc: Unexport InterruptStatsProviderClass-related functions

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

---
 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(-)
hw/intc/i8259_common.c +3 -3
index d90b40fe4c..af2e4a2241 100644
@@ -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);
 
hw/intc/ioapic_common.c +1 -1
index 3cccfc1556..aa5f760871 100644
@@ -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"};
include/hw/i386/ioapic_internal.h +0 -1
index 021e715f11..9880443cc7 100644
@@ -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 */
include/hw/isa/i8259_internal.h +0 -3
index a6ae8a583f..d272d879fb 100644
@@ -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 */
Signature · 1 line
2.34.1
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Bernhard Beschow

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

Quoted 71 lines
---
 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(-)
hw/intc/i8259_common.c +3 -3
index d90b40fe4c..af2e4a2241 100644
@@ -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);
 
hw/intc/ioapic_common.c +1 -1
index 3cccfc1556..aa5f760871 100644
@@ -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"};
include/hw/i386/ioapic_internal.h +0 -1
index 021e715f11..9880443cc7 100644
@@ -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 */
include/hw/isa/i8259_internal.h +0 -3
index a6ae8a583f..d272d879fb 100644
@@ -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 */
Signature · 1 line
2.34.1
Reviewed-by Philippe Mathieu-Daudé on v1 1/1
#2 lore raw
In reply to Bernhard Beschow
Quoted 10 lines · Bernhard Beschow

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

---
  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(-)
#3 lore raw
In reply to Bernhard Beschow
Quoted 65 lines · Bernhard Beschow

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

---
  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(-)
hw/intc/i8259_common.c +3 -3
index d90b40fe4c..af2e4a2241 100644
@@ -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);
 
hw/intc/ioapic_common.c +1 -1
index 3cccfc1556..aa5f760871 100644
@@ -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"};
include/hw/i386/ioapic_internal.h +0 -1
index 021e715f11..9880443cc7 100644
@@ -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 */
include/hw/isa/i8259_internal.h +0 -0
index a6ae8a583f..d272d879fb 100644

include/hw/isa/i8259_internal.h struct PICCommonState { · line 76

Quoted 8 lines
include/hw/isa/i8259_internal.h +0 -3
@@ -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