Re: [Xen-devel] libxl: build error [and 1 more messages]

[Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>]

Christoph Egger writes ("Re: [Xen-devel] libxl: build error"):
> patch attached.

Thanks.  I have applied this.  NB in future it would be helpful for
you to supply a suitable commit message.  In this case I wrote one -
see below.

On Wed, 2012-10-24 at 12:16 +0100, Jan Beulich wrote:
> Afaict that's a mistake of whatever provides this header on your
> system - there's no unconditionally visible "reboot" in the specs
> I have available.

This is true, but I think it's a very forgiveable error and we might
well end up including various headers which import os-specific names.
So Christoph's patch is the right thing to do.

Ian.

# HG changeset patch
# User Christoph Egger <Christoph.Egger@xxxxxxx>
# Date 1351165885 -3600
# Node ID 580aa3946f87eb56690671bf1aa0022228f59c8c
# Parent  22e08c9ac770db07c3c3e7c844aa7153050939f3
xl: avoid shadowing reboot(2)

On NetBSD <unistd.h> mistakenly exposes reboot(2).  Work around this.

Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>

diff -r 22e08c9ac770 -r 580aa3946f87 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c  Wed Oct 24 17:51:48 2012 +0200
+++ b/tools/libxl/xl_cmdimpl.c  Thu Oct 25 12:51:25 2012 +0100
@@ -3721,11 +3721,11 @@ int main_destroy(int argc, char **argv)
     return 0;
 }
 
-static int main_shutdown_or_reboot(int reboot, int argc, char **argv)
+static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv)
 {
     void (*fn)(uint32_t domid,
                libxl_evgen_domain_death **, libxl_ev_user, int) =
-        reboot ? &reboot_domain : &shutdown_domain;
+        do_reboot ? &reboot_domain : &shutdown_domain;
     int opt, i, nb_domain;
     int wait_for_it = 0, all =0;
     int fallback_trigger = 0;

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