| Message ID | 1343316846-25860-18-git-send-email-stefano.stabellini@eu.citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 2012-07-26 at 16:34 +0100, Stefano Stabellini wrote: > > +#define XEN_IO_PROTO_ABI_ARM "arm-abi" I wonder if we ought to call this arm-aarch32-abi or something? I wonder if we can also take the opportunity to fix the ABI cockup for disks on ARM and make the structs the same for both 32 and 64 bit? Ian.
On Fri, 27 Jul 2012, Ian Campbell wrote: > On Thu, 2012-07-26 at 16:34 +0100, Stefano Stabellini wrote: > > > > +#define XEN_IO_PROTO_ABI_ARM "arm-abi" > > I wonder if we ought to call this arm-aarch32-abi or something? So aarch64 has just been renamed to arm64 and you want to rename arm-abi to aarch32-abi? :-) > I wonder if we can also take the opportunity to fix the ABI cockup for > disks on ARM and make the structs the same for both 32 and 64 bit? I think it should be a separate patch, but I'll try to come up with one
On Thu, Jul 26, 2012 at 04:34:00PM +0100, Stefano Stabellini wrote: > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > --- > drivers/block/xen-blkback/blkback.c | 1 + > include/xen/interface/io/protocols.h | 3 +++ > 2 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c > index 73f196c..63dd5b9 100644 > --- a/drivers/block/xen-blkback/blkback.c > +++ b/drivers/block/xen-blkback/blkback.c > @@ -42,6 +42,7 @@ > > #include <xen/events.h> > #include <xen/page.h> > +#include <xen/xen.h> > #include <asm/xen/hypervisor.h> > #include <asm/xen/hypercall.h> > #include "common.h" > diff --git a/include/xen/interface/io/protocols.h b/include/xen/interface/io/protocols.h > index 01fc8ae..0eafaf2 100644 > --- a/include/xen/interface/io/protocols.h > +++ b/include/xen/interface/io/protocols.h > @@ -5,6 +5,7 @@ > #define XEN_IO_PROTO_ABI_X86_64 "x86_64-abi" > #define XEN_IO_PROTO_ABI_IA64 "ia64-abi" > #define XEN_IO_PROTO_ABI_POWERPC64 "powerpc64-abi" > +#define XEN_IO_PROTO_ABI_ARM "arm-abi" So one that has all of the 32/64 issues worked out? Nice. > > #if defined(__i386__) > # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_32 > @@ -14,6 +15,8 @@ > # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_IA64 > #elif defined(__powerpc64__) > # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_POWERPC64 > +#elif defined(__arm__) > +# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_ARM > #else > # error arch fixup needed here > #endif > -- > 1.7.2.5
On Wed, 1 Aug 2012, Konrad Rzeszutek Wilk wrote: > On Thu, Jul 26, 2012 at 04:34:00PM +0100, Stefano Stabellini wrote: > > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > > --- > > drivers/block/xen-blkback/blkback.c | 1 + > > include/xen/interface/io/protocols.h | 3 +++ > > 2 files changed, 4 insertions(+), 0 deletions(-) > > > > diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c > > index 73f196c..63dd5b9 100644 > > --- a/drivers/block/xen-blkback/blkback.c > > +++ b/drivers/block/xen-blkback/blkback.c > > @@ -42,6 +42,7 @@ > > > > #include <xen/events.h> > > #include <xen/page.h> > > +#include <xen/xen.h> > > #include <asm/xen/hypervisor.h> > > #include <asm/xen/hypercall.h> > > #include "common.h" > > diff --git a/include/xen/interface/io/protocols.h b/include/xen/interface/io/protocols.h > > index 01fc8ae..0eafaf2 100644 > > --- a/include/xen/interface/io/protocols.h > > +++ b/include/xen/interface/io/protocols.h > > @@ -5,6 +5,7 @@ > > #define XEN_IO_PROTO_ABI_X86_64 "x86_64-abi" > > #define XEN_IO_PROTO_ABI_IA64 "ia64-abi" > > #define XEN_IO_PROTO_ABI_POWERPC64 "powerpc64-abi" > > +#define XEN_IO_PROTO_ABI_ARM "arm-abi" > > So one that has all of the 32/64 issues worked out? Nice. Yes, that is the idea, but it needs another patch to actually achieve the goal :) > > > > #if defined(__i386__) > > # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_32 > > @@ -14,6 +15,8 @@ > > # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_IA64 > > #elif defined(__powerpc64__) > > # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_POWERPC64 > > +#elif defined(__arm__) > > +# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_ARM > > #else > > # error arch fixup needed here > > #endif > > -- > > 1.7.2.5 >
diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c index 73f196c..63dd5b9 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -42,6 +42,7 @@ #include <xen/events.h> #include <xen/page.h> +#include <xen/xen.h> #include <asm/xen/hypervisor.h> #include <asm/xen/hypercall.h> #include "common.h" diff --git a/include/xen/interface/io/protocols.h b/include/xen/interface/io/protocols.h index 01fc8ae..0eafaf2 100644 --- a/include/xen/interface/io/protocols.h +++ b/include/xen/interface/io/protocols.h @@ -5,6 +5,7 @@ #define XEN_IO_PROTO_ABI_X86_64 "x86_64-abi" #define XEN_IO_PROTO_ABI_IA64 "ia64-abi" #define XEN_IO_PROTO_ABI_POWERPC64 "powerpc64-abi" +#define XEN_IO_PROTO_ABI_ARM "arm-abi" #if defined(__i386__) # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_32 @@ -14,6 +15,8 @@ # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_IA64 #elif defined(__powerpc64__) # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_POWERPC64 +#elif defined(__arm__) +# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_ARM #else # error arch fixup needed here #endif
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- drivers/block/xen-blkback/blkback.c | 1 + include/xen/interface/io/protocols.h | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-)