Re: libxl: build error

[Christoph Egger <Christoph.Egger@amd.com>]

[-- Attachment #1: Type: text/plain, Size: 996 bytes --]

On 10/24/12 11:58, Ian Campbell wrote:
> On Wed, 2012-10-24 at 10:36 +0100, Christoph Egger wrote:
>> Hi,
>>
>> I have this build error:
>>
>> xl_cmdimpl.c:3724:40: error: declaration of 'reboot' shadows a global
>> declaration
> 
> Did gcc tell you where the other global definition was from?

No.

> reboot(2) I suppose?

Yes. <unistd.h> has the prototype.

>> Renaming it to '_reboot' fixes this for me.
> 
> Can you send a patch?
> 
> I don't think _reboot is a legal identifier (reserved for the
> implementation or POSIX or some such). do_reboot would be ok. So would
> changing main_shutdown_or_reboot to take the function pointer directly I
> think.

patch attached.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

Christoph


-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

[-- Attachment #2: xen_tools_libxl.diff --]
[-- Type: text/plain, Size: 703 bytes --]

diff -r ac870df4f165 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c	Wed Oct 24 09:50:52 2012 +0200
+++ b/tools/libxl/xl_cmdimpl.c	Wed Oct 24 11:19:59 2012 +0200
@@ -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;

[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

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