[PATCH] libxl/arm: Fix build on arm64 + acpi

[PATCH] libxl/arm: Fix build on arm64 + acpi

[Daniel Sabogal]

With musl, the build fails with the following errors:

  actypes.h:202:2: error: #error unknown ACPI_MACHINE_WIDTH
   #error unknown ACPI_MACHINE_WIDTH
    ^~~~~
  actypes.h:207:9: error: unknown type name ‘acpi_native_uint’
   typedef acpi_native_uint acpi_size;
           ^~~~~~~~~~~~~~~~
  actypes.h:617:3: error: unknown type name ‘acpi_io_address’
     acpi_io_address pblk_address;
     ^~~~~~~~~~~~~~~

This likely went undetected with glibc builds since glibc
indirectly pulls __BITS_PER_LONG from the linux headers
through a standard header. For musl, this is not the case.

Instead, use BITS_PER_LONG to fix the build.

Signed-off-by: Daniel Sabogal <dsabogalcc@gmail.com>
---
 tools/libxl/libxl_arm_acpi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c
index a6456be662..636f724039 100644
--- a/tools/libxl/libxl_arm_acpi.c
+++ b/tools/libxl/libxl_arm_acpi.c
@@ -37,7 +37,7 @@ typedef int64_t s64;
 #define BITS_PER_LONG 32
 #endif
 #endif
-#define ACPI_MACHINE_WIDTH __BITS_PER_LONG
+#define ACPI_MACHINE_WIDTH BITS_PER_LONG
 #define COMPILER_DEPENDENT_INT64 int64_t
 #define COMPILER_DEPENDENT_UINT64 uint64_t
 
-- 
2.14.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH] libxl/arm: Fix build on arm64 + acpi

[Wei Liu]

On Fri, Aug 25, 2017 at 05:35:47PM -0400, Daniel Sabogal wrote:
> With musl, the build fails with the following errors:
> 
>   actypes.h:202:2: error: #error unknown ACPI_MACHINE_WIDTH
>    #error unknown ACPI_MACHINE_WIDTH
>     ^~~~~
>   actypes.h:207:9: error: unknown type name ‘acpi_native_uint’
>    typedef acpi_native_uint acpi_size;
>            ^~~~~~~~~~~~~~~~
>   actypes.h:617:3: error: unknown type name ‘acpi_io_address’
>      acpi_io_address pblk_address;
>      ^~~~~~~~~~~~~~~
> 
> This likely went undetected with glibc builds since glibc
> indirectly pulls __BITS_PER_LONG from the linux headers
> through a standard header. For musl, this is not the case.
> 
> Instead, use BITS_PER_LONG to fix the build.
> 
> Signed-off-by: Daniel Sabogal <dsabogalcc@gmail.com>

Acked-by: Wei Liu <wei.liu2@citrix.com>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH] libxl/arm: Fix build on arm64 + acpi

[Wei Liu]

On Mon, Aug 28, 2017 at 06:27:51PM +0100, Wei Liu wrote:
> On Fri, Aug 25, 2017 at 05:35:47PM -0400, Daniel Sabogal wrote:
> > With musl, the build fails with the following errors:
> > 
> >   actypes.h:202:2: error: #error unknown ACPI_MACHINE_WIDTH
> >    #error unknown ACPI_MACHINE_WIDTH
> >     ^~~~~
> >   actypes.h:207:9: error: unknown type name ‘acpi_native_uint’
> >    typedef acpi_native_uint acpi_size;
> >            ^~~~~~~~~~~~~~~~
> >   actypes.h:617:3: error: unknown type name ‘acpi_io_address’
> >      acpi_io_address pblk_address;
> >      ^~~~~~~~~~~~~~~
> > 
> > This likely went undetected with glibc builds since glibc
> > indirectly pulls __BITS_PER_LONG from the linux headers
> > through a standard header. For musl, this is not the case.
> > 
> > Instead, use BITS_PER_LONG to fix the build.
> > 
> > Signed-off-by: Daniel Sabogal <dsabogalcc@gmail.com>
> 
> Acked-by: Wei Liu <wei.liu2@citrix.com>

Now applied.

Ian, please backport this.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH] libxl/arm: Fix build on arm64 + acpi

[Wei Liu]

CC Ian

On Tue, Aug 29, 2017 at 11:04:16AM +0100, Wei Liu wrote:
> On Mon, Aug 28, 2017 at 06:27:51PM +0100, Wei Liu wrote:
> > On Fri, Aug 25, 2017 at 05:35:47PM -0400, Daniel Sabogal wrote:
> > > With musl, the build fails with the following errors:
> > > 
> > >   actypes.h:202:2: error: #error unknown ACPI_MACHINE_WIDTH
> > >    #error unknown ACPI_MACHINE_WIDTH
> > >     ^~~~~
> > >   actypes.h:207:9: error: unknown type name ‘acpi_native_uint’
> > >    typedef acpi_native_uint acpi_size;
> > >            ^~~~~~~~~~~~~~~~
> > >   actypes.h:617:3: error: unknown type name ‘acpi_io_address’
> > >      acpi_io_address pblk_address;
> > >      ^~~~~~~~~~~~~~~
> > > 
> > > This likely went undetected with glibc builds since glibc
> > > indirectly pulls __BITS_PER_LONG from the linux headers
> > > through a standard header. For musl, this is not the case.
> > > 
> > > Instead, use BITS_PER_LONG to fix the build.
> > > 
> > > Signed-off-by: Daniel Sabogal <dsabogalcc@gmail.com>
> > 
> > Acked-by: Wei Liu <wei.liu2@citrix.com>
> 
> Now applied.
> 
> Ian, please backport this.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel