[PATCH] spapr/xive: Make spapr_xive_pic_print_info() static

Cédric Le Goater posted 1 patch 4 years, 11 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20201215174025.2636824-1-clg@kaod.org
Maintainers: Greg Kurz <groug@kaod.org>, David Gibson <david@gibson.dropbear.id.au>, "Cédric Le Goater" <clg@kaod.org>
include/hw/ppc/spapr_xive.h | 2 --
hw/intc/spapr_xive.c        | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
[PATCH] spapr/xive: Make spapr_xive_pic_print_info() static
Posted by Cédric Le Goater 4 years, 11 months ago
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 include/hw/ppc/spapr_xive.h | 2 --
 hw/intc/spapr_xive.c        | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h
index 26c8d90d7196..b282960ad90d 100644
--- a/include/hw/ppc/spapr_xive.h
+++ b/include/hw/ppc/spapr_xive.h
@@ -66,8 +66,6 @@ typedef struct SpaprXiveClass {
  */
 #define SPAPR_XIVE_BLOCK_ID 0x0
 
-void spapr_xive_pic_print_info(SpaprXive *xive, Monitor *mon);
-
 struct SpaprMachineState;
 void spapr_xive_hcall_init(struct SpaprMachineState *spapr);
 void spapr_xive_mmio_set_enabled(SpaprXive *xive, bool enable);
diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c
index caedd312d745..801bc1934160 100644
--- a/hw/intc/spapr_xive.c
+++ b/hw/intc/spapr_xive.c
@@ -156,7 +156,7 @@ static void spapr_xive_end_pic_print_info(SpaprXive *xive, XiveEND *end,
 #define spapr_xive_in_kernel(xive) \
     (kvm_irqchip_in_kernel() && (xive)->fd != -1)
 
-void spapr_xive_pic_print_info(SpaprXive *xive, Monitor *mon)
+static void spapr_xive_pic_print_info(SpaprXive *xive, Monitor *mon)
 {
     XiveSource *xsrc = &xive->source;
     int i;
-- 
2.26.2


Re: [PATCH] spapr/xive: Make spapr_xive_pic_print_info() static
Posted by David Gibson 4 years, 11 months ago
On Tue, Dec 15, 2020 at 06:40:25PM +0100, Cédric Le Goater wrote:
> Signed-off-by: Cédric Le Goater <clg@kaod.org>

Applied to ppc-for-6.0, thanks.

> ---
>  include/hw/ppc/spapr_xive.h | 2 --
>  hw/intc/spapr_xive.c        | 2 +-
>  2 files changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h
> index 26c8d90d7196..b282960ad90d 100644
> --- a/include/hw/ppc/spapr_xive.h
> +++ b/include/hw/ppc/spapr_xive.h
> @@ -66,8 +66,6 @@ typedef struct SpaprXiveClass {
>   */
>  #define SPAPR_XIVE_BLOCK_ID 0x0
>  
> -void spapr_xive_pic_print_info(SpaprXive *xive, Monitor *mon);
> -
>  struct SpaprMachineState;
>  void spapr_xive_hcall_init(struct SpaprMachineState *spapr);
>  void spapr_xive_mmio_set_enabled(SpaprXive *xive, bool enable);
> diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c
> index caedd312d745..801bc1934160 100644
> --- a/hw/intc/spapr_xive.c
> +++ b/hw/intc/spapr_xive.c
> @@ -156,7 +156,7 @@ static void spapr_xive_end_pic_print_info(SpaprXive *xive, XiveEND *end,
>  #define spapr_xive_in_kernel(xive) \
>      (kvm_irqchip_in_kernel() && (xive)->fd != -1)
>  
> -void spapr_xive_pic_print_info(SpaprXive *xive, Monitor *mon)
> +static void spapr_xive_pic_print_info(SpaprXive *xive, Monitor *mon)
>  {
>      XiveSource *xsrc = &xive->source;
>      int i;

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson