[kvm-unit-tests] x86/pmu: Fix compilation on 32-bit hosts
diff mbox series

Message ID 20200616105940.2907-1-thuth@redhat.com
State New
Headers show
Series
  • [kvm-unit-tests] x86/pmu: Fix compilation on 32-bit hosts
Related show

Commit Message

Thomas Huth June 16, 2020, 10:59 a.m. UTC
When building for 32-bit hosts, the compiler currently complains:

 x86/pmu.c: In function 'check_gp_counters_write_width':
 x86/pmu.c:490:30: error: left shift count >= width of type

Use the correct suffix to avoid this problem.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 x86/pmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Xu, Like June 16, 2020, 11:13 a.m. UTC | #1
On 2020/6/16 18:59, Thomas Huth wrote:
> When building for 32-bit hosts, the compiler currently complains:
>
>   x86/pmu.c: In function 'check_gp_counters_write_width':
>   x86/pmu.c:490:30: error: left shift count >= width of type
>
> Use the correct suffix to avoid this problem.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Thanks, I admit I did not test it on a 32-bit host.
> ---
>   x86/pmu.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/x86/pmu.c b/x86/pmu.c
> index 57a2b23..91a6fb4 100644
> --- a/x86/pmu.c
> +++ b/x86/pmu.c
> @@ -487,7 +487,7 @@ static void do_unsupported_width_counter_write(void *index)
>   static void  check_gp_counters_write_width(void)
>   {
>   	u64 val_64 = 0xffffff0123456789ull;
> -	u64 val_32 = val_64 & ((1ul << 32) - 1);
> +	u64 val_32 = val_64 & ((1ull << 32) - 1);
>   	u64 val_max_width = val_64 & ((1ul << eax.split.bit_width) - 1);
>   	int i;
>
Thomas Huth June 16, 2020, 11:22 a.m. UTC | #2
On 16/06/2020 13.13, Xu, Like wrote:
> On 2020/6/16 18:59, Thomas Huth wrote:
>> When building for 32-bit hosts, the compiler currently complains:
>>
>>   x86/pmu.c: In function 'check_gp_counters_write_width':
>>   x86/pmu.c:490:30: error: left shift count >= width of type
>>
>> Use the correct suffix to avoid this problem.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>
> Thanks, I admit I did not test it on a 32-bit host.

No problem, that's what the CI is good for :-)

(if you have a github or gitlab account, you can also run the tests
there before submitting a patch)

 Thomas
Paolo Bonzini June 16, 2020, 12:29 p.m. UTC | #3
On 16/06/20 12:59, Thomas Huth wrote:
> When building for 32-bit hosts, the compiler currently complains:
> 
>  x86/pmu.c: In function 'check_gp_counters_write_width':
>  x86/pmu.c:490:30: error: left shift count >= width of type
> 
> Use the correct suffix to avoid this problem.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  x86/pmu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/x86/pmu.c b/x86/pmu.c
> index 57a2b23..91a6fb4 100644
> --- a/x86/pmu.c
> +++ b/x86/pmu.c
> @@ -487,7 +487,7 @@ static void do_unsupported_width_counter_write(void *index)
>  static void  check_gp_counters_write_width(void)
>  {
>  	u64 val_64 = 0xffffff0123456789ull;
> -	u64 val_32 = val_64 & ((1ul << 32) - 1);
> +	u64 val_32 = val_64 & ((1ull << 32) - 1);
>  	u64 val_max_width = val_64 & ((1ul << eax.split.bit_width) - 1);
>  	int i;
>  
> 

Oh ok, applied.  Thanks,

Paolo

Patch
diff mbox series

diff --git a/x86/pmu.c b/x86/pmu.c
index 57a2b23..91a6fb4 100644
--- a/x86/pmu.c
+++ b/x86/pmu.c
@@ -487,7 +487,7 @@  static void do_unsupported_width_counter_write(void *index)
 static void  check_gp_counters_write_width(void)
 {
 	u64 val_64 = 0xffffff0123456789ull;
-	u64 val_32 = val_64 & ((1ul << 32) - 1);
+	u64 val_32 = val_64 & ((1ull << 32) - 1);
 	u64 val_max_width = val_64 & ((1ul << eax.split.bit_width) - 1);
 	int i;