[PATCH] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[PATCH] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[Andrew Cooper]

gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between
uint64_t and unsigned long.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>

---
This needs backporting to 4.5
---
 tools/libxc/xc_domain.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
index 95e3098..9434045 100644
--- a/tools/libxc/xc_domain.c
+++ b/tools/libxc/xc_domain.c
@@ -2034,7 +2034,7 @@ int xc_domain_memory_mapping(
     max_batch_sz = nr_mfns;
     do
     {
-        nr = min(nr_mfns - done, max_batch_sz);
+        nr = min_t(unsigned long, nr_mfns - done, max_batch_sz);
         domctl.u.memory_mapping.nr_mfns = nr;
         domctl.u.memory_mapping.first_gfn = first_gfn + done;
         domctl.u.memory_mapping.first_mfn = first_mfn + done;
-- 
1.7.10.4

[PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[Andrew Cooper]

gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between
uint64_t and unsigned long.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>

---
This needs backporting to 4.2
---
 tools/libxc/xc_domain.c |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
index 40ca771..6f93ebd 100644
--- a/tools/libxc/xc_domain.c
+++ b/tools/libxc/xc_domain.c
@@ -1641,12 +1641,9 @@ int xc_map_domain_meminfo(xc_interface *xch, int domid,
     return -1;
 }
 
-#ifndef min
-#define min(X, Y) ({                             \
-            const typeof (X) _x = (X);           \
-            const typeof (Y) _y = (Y);           \
-            (void) (&_x == &_y);                 \
-            (_x < _y) ? _x : _y; })
+#ifndef min_t
+#define min_t(type,x,y) \
+    ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; })
 #endif
 int xc_domain_memory_mapping(
     xc_interface *xch,
@@ -1669,7 +1666,7 @@ int xc_domain_memory_mapping(
     max_batch_sz = nr_mfns;
     do
     {
-        nr = min(nr_mfns - done, max_batch_sz);
+        nr = min_t(unsigned long, nr_mfns - done, max_batch_sz);
         domctl.u.memory_mapping.nr_mfns = nr;
         domctl.u.memory_mapping.first_gfn = first_gfn + done;
         domctl.u.memory_mapping.first_mfn = first_mfn + done;
@@ -1705,7 +1702,7 @@ int xc_domain_memory_mapping(
 
     return ret;
 }
-#undef min
+#undef min_t
 int xc_domain_ioport_mapping(
     xc_interface *xch,
     uint32_t domid,
-- 
1.7.10.4

Re: [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[Ian Jackson]

Andrew Cooper writes ("[Xen-devel] [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
> gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between
> uint64_t and unsigned long.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> CC: Ian Campbell <Ian.Campbell@citrix.com>
> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
> CC: Wei Liu <wei.liu2@citrix.com>

FTR, this backport is itself:

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

And I have queued it.

Ian.

Re: [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[Ian Jackson]

Andrew Cooper writes ("[Xen-devel] [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
> gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between
> uint64_t and unsigned long.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> CC: Ian Campbell <Ian.Campbell@citrix.com>
> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
> CC: Wei Liu <wei.liu2@citrix.com>
> 
> ---
> This needs backporting to 4.2

This doesn't seem to apply to my staging-4.5.

Ian.

Re: [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[Andrew Cooper]

On 23/06/15 11:55, Ian Jackson wrote:
> Andrew Cooper writes ("[Xen-devel] [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
>> gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between
>> uint64_t and unsigned long.
>>
>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>> CC: Ian Campbell <Ian.Campbell@citrix.com>
>> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
>> CC: Wei Liu <wei.liu2@citrix.com>
>>
>> ---
>> This needs backporting to 4.2
> This doesn't seem to apply to my staging-4.5.
>
> Ian.

It wont.  This patch is for 4.4 and earlier.  The previously-committed
version for staging is a clean cherrypick back to 4.5

~Andrew

Re: [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[Ian Jackson]

Ian Jackson writes ("Re: [Xen-devel] [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
> Andrew Cooper writes ("[Xen-devel] [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
> > gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between
> > uint64_t and unsigned long.
> > 
> > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> > CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> > CC: Ian Campbell <Ian.Campbell@citrix.com>
> > CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
> > CC: Wei Liu <wei.liu2@citrix.com>
> > 
> > ---
> > This needs backporting to 4.2
> 
> This doesn't seem to apply to my staging-4.5.

Sorry, I meant, to my staging-4.4.

Ian.

Re: [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[Andrew Cooper]

On 23/06/15 14:21, Ian Jackson wrote:
> Ian Jackson writes ("Re: [Xen-devel] [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
>> Andrew Cooper writes ("[Xen-devel] [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
>>> gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between
>>> uint64_t and unsigned long.
>>>
>>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>>> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>>> CC: Ian Campbell <Ian.Campbell@citrix.com>
>>> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
>>> CC: Wei Liu <wei.liu2@citrix.com>
>>>
>>> ---
>>> This needs backporting to 4.2
>> This doesn't seem to apply to my staging-4.5.
> Sorry, I meant, to my staging-4.4.

You appear to have committed half of it as staging-4.4~2

~Andrew

Re: [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[Ian Jackson]

Andrew Cooper writes ("Re: [Xen-devel] [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
> On 23/06/15 14:21, Ian Jackson wrote:
> > Sorry, I meant, to my staging-4.4.
> 
> You appear to have committed half of it as staging-4.4~2

Nnnngg.  Sorry.  I think I am trying to do too many different things
at once.

Ian.

Re: [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[Ian Jackson]

Ian Jackson writes ("Re: [Xen-devel] [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
> Andrew Cooper writes ("Re: [Xen-devel] [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
> > On 23/06/15 14:21, Ian Jackson wrote:
> > > Sorry, I meant, to my staging-4.4.
> > 
> > You appear to have committed half of it as staging-4.4~2
> 
> Nnnngg.  Sorry.  I think I am trying to do too many different things
> at once.

Now fixed.

Ian.

Re: [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[Andrew Cooper]

On 23/06/15 15:16, Ian Jackson wrote:
> Ian Jackson writes ("Re: [Xen-devel] [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
>> Andrew Cooper writes ("Re: [Xen-devel] [PATCH] [XEN-4.4] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
>>> On 23/06/15 14:21, Ian Jackson wrote:
>>>> Sorry, I meant, to my staging-4.4.
>>> You appear to have committed half of it as staging-4.4~2
>> Nnnngg.  Sorry.  I think I am trying to do too many different things
>> at once.
> Now fixed.
>
> Ian.

Thanks.

~Andrew

Re: [PATCH] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[Ian Jackson]

Andrew Cooper writes ("[Xen-devel] [PATCH] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
> gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between
> uint64_t and unsigned long.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> CC: Ian Campbell <Ian.Campbell@citrix.com>
> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
> CC: Wei Liu <wei.liu2@citrix.com>

As and when this is acked and pushed to #staging, we should update the
advisory.

> This needs backporting to 4.5

To be clear, do you know whether this is a trivial cherry pick ?

Ian.

Re: [PATCH] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[Andrew Cooper]

On 13/04/15 17:33, Ian Jackson wrote:
> Andrew Cooper writes ("[Xen-devel] [PATCH] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
>> gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between
>> uint64_t and unsigned long.
>>
>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>> CC: Ian Campbell <Ian.Campbell@citrix.com>
>> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
>> CC: Wei Liu <wei.liu2@citrix.com>
> As and when this is acked and pushed to #staging, we should update the
> advisory.
>
>> This needs backporting to 4.5
> To be clear, do you know whether this is a trivial cherry pick ?

It is trivial to cherrypick.

4.4 is the problematic case which I did the backport for separately, but
then that is trivial to cherrypick back to 4.2

~Andrew

Re: [PATCH] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[Andrew Cooper]

Ping on the patches themselves?

On 13/04/15 17:37, Andrew Cooper wrote:
> On 13/04/15 17:33, Ian Jackson wrote:
>> Andrew Cooper writes ("[Xen-devel] [PATCH] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
>>> gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between
>>> uint64_t and unsigned long.
>>>
>>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>>> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>>> CC: Ian Campbell <Ian.Campbell@citrix.com>
>>> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
>>> CC: Wei Liu <wei.liu2@citrix.com>
>> As and when this is acked and pushed to #staging, we should update the
>> advisory.
>>
>>> This needs backporting to 4.5
>> To be clear, do you know whether this is a trivial cherry pick ?
> It is trivial to cherrypick.
>
> 4.4 is the problematic case which I did the backport for separately, but
> then that is trivial to cherrypick back to 4.2
>
> ~Andrew
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

Re: [PING] [PATCH] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[Andrew Cooper]

Ping again.

These should be included in 4.5.1

~Andrew

On 22/04/15 16:43, Andrew Cooper wrote:
> Ping on the patches themselves?
>
> On 13/04/15 17:37, Andrew Cooper wrote:
>> On 13/04/15 17:33, Ian Jackson wrote:
>>> Andrew Cooper writes ("[Xen-devel] [PATCH] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
>>>> gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between
>>>> uint64_t and unsigned long.
>>>>
>>>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>>>> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>>>> CC: Ian Campbell <Ian.Campbell@citrix.com>
>>>> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
>>>> CC: Wei Liu <wei.liu2@citrix.com>
>>> As and when this is acked and pushed to #staging, we should update the
>>> advisory.
>>>
>>>> This needs backporting to 4.5
>>> To be clear, do you know whether this is a trivial cherry pick ?
>> It is trivial to cherrypick.
>>
>> 4.4 is the problematic case which I did the backport for separately, but
>> then that is trivial to cherrypick back to 4.2
>>
>> ~Andrew
>>
>> _______________________________________________
>> Xen-devel mailing list
>> Xen-devel@lists.xen.org
>> http://lists.xen.org/xen-devel
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

Re: [PING] [PING] [PATCH] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[Andrew Cooper]

This patch is still needed in all branches which currently contain
XSA-125, including staging.

~Andrew

On 13/05/15 12:42, Andrew Cooper wrote:
> Ping again.
>
> These should be included in 4.5.1
>
> ~Andrew
>
> On 22/04/15 16:43, Andrew Cooper wrote:
>> Ping on the patches themselves?
>>
>> On 13/04/15 17:37, Andrew Cooper wrote:
>>> On 13/04/15 17:33, Ian Jackson wrote:
>>>> Andrew Cooper writes ("[Xen-devel] [PATCH] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
>>>>> gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between
>>>>> uint64_t and unsigned long.
>>>>>
>>>>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>>>>> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>>>>> CC: Ian Campbell <Ian.Campbell@citrix.com>
>>>>> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
>>>>> CC: Wei Liu <wei.liu2@citrix.com>
>>>> As and when this is acked and pushed to #staging, we should update the
>>>> advisory.
>>>>
>>>>> This needs backporting to 4.5
>>>> To be clear, do you know whether this is a trivial cherry pick ?
>>> It is trivial to cherrypick.
>>>
>>> 4.4 is the problematic case which I did the backport for separately, but
>>> then that is trivial to cherrypick back to 4.2
>>>
>>> ~Andrew
>>>
>>> _______________________________________________
>>> Xen-devel mailing list
>>> Xen-devel@lists.xen.org
>>> http://lists.xen.org/xen-devel
>> _______________________________________________
>> Xen-devel mailing list
>> Xen-devel@lists.xen.org
>> http://lists.xen.org/xen-devel
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

Re: [PATCH] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125

[Ian Jackson]

Andrew Cooper writes ("[Xen-devel] [PATCH] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"):
> gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between
> uint64_t and unsigned long.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

I am about to apply this to staging and queue it for backport.

Ian.