From mboxrd@z Thu Jan 1 00:00:00 1970 From: Doug Goldstein Subject: Re: [PATCH 4/4] hvmloader: Use xen/errno.h rather than the host systems errno.h Date: Wed, 2 Mar 2016 06:53:30 -0600 Message-ID: <56D6E24A.60206@cardoe.com> References: <1456858641-20776-1-git-send-email-andrew.cooper3@citrix.com> <1456858641-20776-4-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5961930570339756778==" Return-path: In-Reply-To: <1456858641-20776-4-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Andrew Cooper , Xen-devel Cc: Wei Liu , Ian Jackson , Ian Campbell , Jan Beulich List-Id: xen-devel@lists.xenproject.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============5961930570339756778== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="vmBBhVxLIsDjw1md9mAXNuaURPLoHRcF5" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --vmBBhVxLIsDjw1md9mAXNuaURPLoHRcF5 Content-Type: multipart/mixed; boundary="15ls3vXrTnOWpE0TG5n5x1xFgEiIaT2nI" From: Doug Goldstein To: Andrew Cooper , Xen-devel Cc: Jan Beulich , Ian Campbell , Ian Jackson , Wei Liu Message-ID: <56D6E24A.60206@cardoe.com> Subject: Re: [PATCH 4/4] hvmloader: Use xen/errno.h rather than the host systems errno.h References: <1456858641-20776-1-git-send-email-andrew.cooper3@citrix.com> <1456858641-20776-4-git-send-email-andrew.cooper3@citrix.com> In-Reply-To: <1456858641-20776-4-git-send-email-andrew.cooper3@citrix.com> --15ls3vXrTnOWpE0TG5n5x1xFgEiIaT2nI Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 3/1/16 12:57 PM, Andrew Cooper wrote: > hvmloader is unhosted, and shouldn't use the system errno.h. It alread= y has > to use Xen's errno.h for other hypercalls. The use of public/io/xs_wir= e.h > requires the use of un-prefixed errno values. >=20 > This fixes the build on stricter toolchains where requesting -fno-built= in does > reduce the include path as much as it can. >=20 > Reported-by: Doug Goldstein > Signed-off-by: Andrew Cooper Reviewed-by: Doug Goldstein > --- > CC: Jan Beulich > CC: Ian Campbell > CC: Ian Jackson > CC: Wei Liu > CC: Doug Goldstein >=20 > v3: > * Split single patch multiple fixes > v2: > * Fix compilation. I am not sure how v1 compiled, but I did definitel= y check > it before posting. > --- > tools/firmware/hvmloader/util.h | 9 +++++++++ > tools/firmware/hvmloader/vnuma.c | 3 +-- > tools/firmware/hvmloader/xenbus.c | 1 - > 3 files changed, 10 insertions(+), 3 deletions(-) >=20 > diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader= /util.h > index 132d915..3126817 100644 > --- a/tools/firmware/hvmloader/util.h > +++ b/tools/firmware/hvmloader/util.h > @@ -9,6 +9,15 @@ > #include > #include "e820.h" > =20 > +/* Request un-prefixed values from errno.h. */ > +#define XEN_ERRNO(name, value) name =3D value, > +enum { > +#include > +}; > + > +/* Cause xs_wire.h to give us xsd_errors[]. */ > +#define EINVAL EINVAL > + > #define __STR(...) #__VA_ARGS__ > #define STR(...) __STR(__VA_ARGS__) > =20 > diff --git a/tools/firmware/hvmloader/vnuma.c b/tools/firmware/hvmloade= r/vnuma.c > index 4121cc6..85c1a79 100644 > --- a/tools/firmware/hvmloader/vnuma.c > +++ b/tools/firmware/hvmloader/vnuma.c > @@ -28,7 +28,6 @@ > #include "util.h" > #include "hypercall.h" > #include "vnuma.h" > -#include > =20 > unsigned int nr_vnodes, nr_vmemranges; > unsigned int *vcpu_to_vnode, *vdistance; > @@ -40,7 +39,7 @@ void init_vnuma_info(void) > struct xen_vnuma_topology_info vnuma_topo =3D { .domid =3D DOMID_S= ELF }; > =20 > rc =3D hypercall_memory_op(XENMEM_get_vnumainfo, &vnuma_topo); > - if ( rc !=3D -XEN_ENOBUFS ) > + if ( rc !=3D -ENOBUFS ) > return; > =20 > ASSERT(vnuma_topo.nr_vcpus =3D=3D hvm_info->nr_vcpus); > diff --git a/tools/firmware/hvmloader/xenbus.c b/tools/firmware/hvmload= er/xenbus.c > index d0ed993..448157d 100644 > --- a/tools/firmware/hvmloader/xenbus.c > +++ b/tools/firmware/hvmloader/xenbus.c > @@ -27,7 +27,6 @@ > =20 > #include "util.h" > #include "hypercall.h" > -#include > #include > #include > #include >=20 --=20 Doug Goldstein --15ls3vXrTnOWpE0TG5n5x1xFgEiIaT2nI-- --vmBBhVxLIsDjw1md9mAXNuaURPLoHRcF5 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJW1uJNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNTM5MEQ2RTNFMTkyNzlCNzVDMzIwOTVB MkJDMDNEQzg3RUQxQkQ0AAoJEKK8A9yH7RvUVSYP/1/IvnVbJ/maWZ1Wms8HteT5 YYQPxnisCCr4Syw1JduovQIuJrGiDie7sbz5cKbE3qdiiukxw2X+dK4Cwv42BpME FHv08w1zZ7TZYo/KAN1vKm5BYuAAOrW/Yuud55MgL74ilG016zxhspZ8dWvC1S8n 3IouMvq17y+bRZO9D8By4ozxbsFrTjWajSkJHnihSnJdCylAjxEuThRxQPeuVGGG K5jCGfIx31qZqitqM0xsKMo1jjq7FILt79XT14GP7m5w7z2k/+D2MEj5PbE+HiCm 6Irq36GJoeYFkdgjkyfFzgy7hSLalGkVtBi3CGSmuv656Qbvhw6yu5GkY6m5zo6v kJTAsWPR4BEg6VeZWRby3CVDGkFu8j/JBrltwnKP1st3CPC+BXN4DuaSjxpgA/ep /tWPK33Jbq8cFuM2NoSMSCu2lfRPd/PPSOL3FoBxTDMYwt54NKEfd/gWGcER74e/ y+WlrABDVclZYy9nf3aGoztU5OamReC3GaUNOmBAYuim4JLAOtgnyph6mRhW5aZ7 Cof3gvxdA6KOfYps7WMtcISVb21DpH65CUwnnJDW2u2eJI58Y8LE0ZqNhQYURVjn rGCEgXiUxxXb+WKk2MZA957UkJ8DYNQf/SVAC8JVT5mekRWnfZyW9hQYrqEitvFJ B5je/dWmIaJMzh/LYk8+ =lOVy -----END PGP SIGNATURE----- --vmBBhVxLIsDjw1md9mAXNuaURPLoHRcF5-- --===============5961930570339756778== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVs IG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9y Zy94ZW4tZGV2ZWwK --===============5961930570339756778==--