hvmloader is unhosted, and shouldn't use the system errno.h. It already has
to use Xen's errno.h for other hypercalls. The use of public/io/xs_wire.h
requires the use of un-prefixed errno values.
This fixes the build on stricter toolchains where requesting -fno-builtin does
reduce the include path as much as it can.
Reported-by: Doug Goldstein <car...@cardoe.com>
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
---
CC: Jan Beulich <jbeul...@suse.com>
CC: Ian Campbell <ian.campb...@citrix.com>
CC: Ian Jackson <ian.jack...@eu.citrix.com>
CC: Wei Liu <wei.l...@citrix.com>
CC: Doug Goldstein <car...@cardoe.com>
v3:
* Split single patch multiple fixes
v2:
* Fix compilation. I am not sure how v1 compiled, but I did definitely 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(-)
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 <xen/hvm/hvm_info_table.h>
#include "e820.h"
+/* Request un-prefixed values from errno.h. */
+#define XEN_ERRNO(name, value) name = value,
+enum {
+#include <xen/errno.h>
+};
+
+/* Cause xs_wire.h to give us xsd_errors[]. */
+#define EINVAL EINVAL
+
#define __STR(...) #__VA_ARGS__
#define STR(...) __STR(__VA_ARGS__)
diff --git a/tools/firmware/hvmloader/vnuma.c b/tools/firmware/hvmloader/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 <xen/errno.h>
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 = { .domid = DOMID_SELF };
rc = hypercall_memory_op(XENMEM_get_vnumainfo, &vnuma_topo);
- if ( rc != -XEN_ENOBUFS )
+ if ( rc != -ENOBUFS )
return;
ASSERT(vnuma_topo.nr_vcpus == hvm_info->nr_vcpus);
diff --git a/tools/firmware/hvmloader/xenbus.c
b/tools/firmware/hvmloader/xenbus.c
index d0ed993..448157d 100644
--- a/tools/firmware/hvmloader/xenbus.c
+++ b/tools/firmware/hvmloader/xenbus.c
@@ -27,7 +27,6 @@
#include "util.h"
#include "hypercall.h"
-#include <errno.h>
#include <xen/sched.h>
#include <xen/event_channel.h>
#include <xen/hvm/params.h>
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
