[PATCH] tools/libs: guest: Fix Arm build after 8fc4916daf2a

[PATCH] tools/libs: guest: Fix Arm build after 8fc4916daf2a

[Julien Grall]

From: Julien Grall <jgrall@amazon.com>

Gitlab CI spotted an issue when building the tools Arm:

xg_dom_arm.c: In function 'meminit':
xg_dom_arm.c:401:50: error: passing argument 3 of 'set_mode' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
  401 |     rc = set_mode(dom->xch, dom->guest_domid, dom->guest_type);
      |                                               ~~~^~~~~~~~~~~~

This is because the const was not propagated in the Arm code. Fix it
by constifying the 3rd parameter of set_mode().

Fixes: 8fc4916daf2a ("tools/libs: guest: Use const whenever we point to literal strings")
Signed-off-by: Julien Grall <jgrall@amazon.com>
---
 tools/libs/guest/xg_dom_arm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libs/guest/xg_dom_arm.c b/tools/libs/guest/xg_dom_arm.c
index b4c24f15fb27..01e85e0ea9c7 100644
--- a/tools/libs/guest/xg_dom_arm.c
+++ b/tools/libs/guest/xg_dom_arm.c
@@ -195,7 +195,7 @@ static int vcpu_arm64(struct xc_dom_image *dom)
 
 /* ------------------------------------------------------------------------ */
 
-static int set_mode(xc_interface *xch, uint32_t domid, char *guest_type)
+static int set_mode(xc_interface *xch, uint32_t domid, const char *guest_type)
 {
     static const struct {
         char           *guest;
-- 
2.17.1

Re: [PATCH] tools/libs: guest: Fix Arm build after 8fc4916daf2a

[Andrew Cooper]

On 18/05/2021 18:03, Julien Grall wrote:
> From: Julien Grall <jgrall@amazon.com>
>
> Gitlab CI spotted an issue when building the tools Arm:
>
> xg_dom_arm.c: In function 'meminit':
> xg_dom_arm.c:401:50: error: passing argument 3 of 'set_mode' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
>   401 |     rc = set_mode(dom->xch, dom->guest_domid, dom->guest_type);
>       |                                               ~~~^~~~~~~~~~~~
>
> This is because the const was not propagated in the Arm code. Fix it
> by constifying the 3rd parameter of set_mode().
>
> Fixes: 8fc4916daf2a ("tools/libs: guest: Use const whenever we point to literal strings")
> Signed-off-by: Julien Grall <jgrall@amazon.com>

Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

Re: [PATCH] tools/libs: guest: Fix Arm build after 8fc4916daf2a

[Julien Grall]

Hi,

On 18/05/2021 18:05, Andrew Cooper wrote:
> On 18/05/2021 18:03, Julien Grall wrote:
>> From: Julien Grall <jgrall@amazon.com>
>>
>> Gitlab CI spotted an issue when building the tools Arm:
>>
>> xg_dom_arm.c: In function 'meminit':
>> xg_dom_arm.c:401:50: error: passing argument 3 of 'set_mode' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
>>    401 |     rc = set_mode(dom->xch, dom->guest_domid, dom->guest_type);
>>        |                                               ~~~^~~~~~~~~~~~
>>
>> This is because the const was not propagated in the Arm code. Fix it
>> by constifying the 3rd parameter of set_mode().
>>
>> Fixes: 8fc4916daf2a ("tools/libs: guest: Use const whenever we point to literal strings")
>> Signed-off-by: Julien Grall <jgrall@amazon.com>
> 
> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

Thanks! I have committed with just your ack to unblock the build.

CHeers,

-- 
Julien Grall