From 359f490021e69220313ca8bd2981bad4fcfea0db Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Tue, 28 Jun 2022 09:55:28 -0600
Subject: Fix compilation error with gcc13.

xc_psr.c:161:5: error: conflicting types for 'xc_psr_cmt_get_data'
due to enum/integer mismatch;

Signed-off-by: Charles Arnold <carnold@suse.com>
---
  tools/include/xenctrl.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h
index 5464a68eb2..0c8b4c3aa7 100644
--- a/tools/include/xenctrl.h
+++ b/tools/include/xenctrl.h
@@ -2520,7 +2520,7 @@ int xc_psr_cmt_get_l3_event_mask(xc_interface 
*xch, uint32_t *event_mask);
  int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu,
                                   uint32_t *l3_cache_size);
  int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu,
-                        uint32_t psr_cmt_type, uint64_t *monitor_data,
+                        xc_psr_cmt_type type, uint64_t *monitor_data,
                          uint64_t *tsc);
  int xc_psr_cmt_enabled(xc_interface *xch);

-- 
2.31.1

(Cc-ing maintainers / reviewers)

On 28.06.2022 18:09, Charles Arnold wrote:
>  From 359f490021e69220313ca8bd2981bad4fcfea0db Mon Sep 17 00:00:00 2001
> From: Charles Arnold <carnold@suse.com>
> Date: Tue, 28 Jun 2022 09:55:28 -0600
> Subject: Fix compilation error with gcc13.
> 
> xc_psr.c:161:5: error: conflicting types for 'xc_psr_cmt_get_data'
> due to enum/integer mismatch;
> 
> Signed-off-by: Charles Arnold <carnold@suse.com>

Reviewed-by: Jan Beulich <jbeulich@suse.com>

The subject would benefit from having a "libxc: " prefix, to know at
the first glance which component is being touched.

> --- a/tools/include/xenctrl.h
> +++ b/tools/include/xenctrl.h
> @@ -2520,7 +2520,7 @@ int xc_psr_cmt_get_l3_event_mask(xc_interface 
> *xch, uint32_t *event_mask);
>   int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu,
>                                    uint32_t *l3_cache_size);
>   int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu,
> -                        uint32_t psr_cmt_type, uint64_t *monitor_data,
> +                        xc_psr_cmt_type type, uint64_t *monitor_data,
>                           uint64_t *tsc);
>   int xc_psr_cmt_enabled(xc_interface *xch);
> 

The patch looks slightly garbled, reminding me of how things looked
for me before I adjusted TB configuration accordingly. I'd be fine
hand-editing the patch while committing, if no other need arises for
a v2 (and of course once a maintainer ack has been provided).

Jan

On Wed, Jun 29, 2022 at 08:29:02AM +0200, Jan Beulich wrote:
> (Cc-ing maintainers / reviewers)
> 
> On 28.06.2022 18:09, Charles Arnold wrote:
> >  From 359f490021e69220313ca8bd2981bad4fcfea0db Mon Sep 17 00:00:00 2001
> > From: Charles Arnold <carnold@suse.com>
> > Date: Tue, 28 Jun 2022 09:55:28 -0600
> > Subject: Fix compilation error with gcc13.
> > 
> > xc_psr.c:161:5: error: conflicting types for 'xc_psr_cmt_get_data'
> > due to enum/integer mismatch;
> > 
> > Signed-off-by: Charles Arnold <carnold@suse.com>
> 
> Reviewed-by: Jan Beulich <jbeulich@suse.com>
> 
> The subject would benefit from having a "libxc: " prefix, to know at
> the first glance which component is being touched.
> 
> > --- a/tools/include/xenctrl.h
> > +++ b/tools/include/xenctrl.h
> > @@ -2520,7 +2520,7 @@ int xc_psr_cmt_get_l3_event_mask(xc_interface 
> > *xch, uint32_t *event_mask);
> >   int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu,
> >                                    uint32_t *l3_cache_size);
> >   int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu,
> > -                        uint32_t psr_cmt_type, uint64_t *monitor_data,
> > +                        xc_psr_cmt_type type, uint64_t *monitor_data,
> >                           uint64_t *tsc);
> >   int xc_psr_cmt_enabled(xc_interface *xch);
> > 
> 
> The patch looks slightly garbled, reminding me of how things looked
> for me before I adjusted TB configuration accordingly. I'd be fine
> hand-editing the patch while committing, if no other need arises for
> a v2 (and of course once a maintainer ack has been provided).

Acked-by: Anthony PERARD <anthony.perard@citrix.com>

Thanks,

-- 
Anthony PERARD

On 29.06.2022 08:29, Jan Beulich wrote:
> (Cc-ing maintainers / reviewers)
> 
> On 28.06.2022 18:09, Charles Arnold wrote:
>>  From 359f490021e69220313ca8bd2981bad4fcfea0db Mon Sep 17 00:00:00 2001
>> From: Charles Arnold <carnold@suse.com>
>> Date: Tue, 28 Jun 2022 09:55:28 -0600
>> Subject: Fix compilation error with gcc13.
>>
>> xc_psr.c:161:5: error: conflicting types for 'xc_psr_cmt_get_data'
>> due to enum/integer mismatch;
>>
>> Signed-off-by: Charles Arnold <carnold@suse.com>
> 
> Reviewed-by: Jan Beulich <jbeulich@suse.com>
> 
> The subject would benefit from having a "libxc: " prefix, to know at
> the first glance which component is being touched.
> 
>> --- a/tools/include/xenctrl.h
>> +++ b/tools/include/xenctrl.h
>> @@ -2520,7 +2520,7 @@ int xc_psr_cmt_get_l3_event_mask(xc_interface 
>> *xch, uint32_t *event_mask);
>>   int xc_psr_cmt_get_l3_cache_size(xc_interface *xch, uint32_t cpu,
>>                                    uint32_t *l3_cache_size);
>>   int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu,
>> -                        uint32_t psr_cmt_type, uint64_t *monitor_data,
>> +                        xc_psr_cmt_type type, uint64_t *monitor_data,
>>                           uint64_t *tsc);
>>   int xc_psr_cmt_enabled(xc_interface *xch);
>>
> 
> The patch looks slightly garbled, reminding me of how things looked
> for me before I adjusted TB configuration accordingly. I'd be fine
> hand-editing the patch while committing, if no other need arises for
> a v2 (and of course once a maintainer ack has been provided).

Anthony - any chance of getting an ack on this pretty straightforward
change (which I also consider a backporting candidate)?

Thanks, Jan