libxl: copy & paste bug

libxl: copy & paste bug

[Christoph Egger]

Hi!

In tools/libxl/libxl_bootloader.c, at the end of the
function libxl_run_bootloader() are the following lines:

if (fifo_fd > -1)
    close(fifo_fd);
if (bootloader_fd > -1)
    close(bootloader_fd);
if (xenconsoled_fd > -1)
    close(xenconsoled_fd);
if (xenconsoled_slave > -1)
    close(xenconsoled_fd);

The last line is wrong. It should be:

    close(xenconsoled_slave);

Christoph


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

Re: libxl: copy & paste bug

[Ian Campbell]

On Tue, 2010-10-05 at 11:05 +0100, Christoph Egger wrote:
> Hi!
> 
> In tools/libxl/libxl_bootloader.c, at the end of the
> function libxl_run_bootloader() are the following lines:
> 
> if (fifo_fd > -1)
>     close(fifo_fd);
> if (bootloader_fd > -1)
>     close(bootloader_fd);
> if (xenconsoled_fd > -1)
>     close(xenconsoled_fd);
> if (xenconsoled_slave > -1)
>     close(xenconsoled_fd);
> 
> The last line is wrong. It should be:
> 
>     close(xenconsoled_slave);

Indeed. Please can you post a patch.

Ian.

Re: libxl: copy & paste bug

[Christoph Egger]

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

On Tuesday 05 October 2010 12:08:18 Ian Campbell wrote:
> On Tue, 2010-10-05 at 11:05 +0100, Christoph Egger wrote:
> > Hi!
> >
> > In tools/libxl/libxl_bootloader.c, at the end of the
> > function libxl_run_bootloader() are the following lines:
> >
> > if (fifo_fd > -1)
> >     close(fifo_fd);
> > if (bootloader_fd > -1)
> >     close(bootloader_fd);
> > if (xenconsoled_fd > -1)
> >     close(xenconsoled_fd);
> > if (xenconsoled_slave > -1)
> >     close(xenconsoled_fd);
> >
> > The last line is wrong. It should be:
> >
> >     close(xenconsoled_slave);
>
> Indeed. Please can you post a patch.

Attached.

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



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

[-- Attachment #2: xen_libxl.diff --]
[-- Type: text/x-diff, Size: 423 bytes --]

diff -r cdff378e61eb tools/libxl/libxl_bootloader.c
--- a/tools/libxl/libxl_bootloader.c	Tue Oct 05 12:43:27 2010 +0200
+++ b/tools/libxl/libxl_bootloader.c	Tue Oct 05 12:46:27 2010 +0200
@@ -429,7 +429,7 @@ out_close:
     if (xenconsoled_fd > -1)
         close(xenconsoled_fd);
     if (xenconsoled_slave > -1)
-        close(xenconsoled_fd);
+        close(xenconsoled_slave);
 
     if (fifo) {
         unlink(fifo);

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

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

Re: libxl: copy & paste bug

[Ian Campbell]

On Tue, 2010-10-05 at 11:47 +0100, Christoph Egger wrote:
> On Tuesday 05 October 2010 12:08:18 Ian Campbell wrote:
> > On Tue, 2010-10-05 at 11:05 +0100, Christoph Egger wrote:
> > > Hi!
> > >
> > > In tools/libxl/libxl_bootloader.c, at the end of the
> > > function libxl_run_bootloader() are the following lines:
> > >
> > > if (fifo_fd > -1)
> > >     close(fifo_fd);
> > > if (bootloader_fd > -1)
> > >     close(bootloader_fd);
> > > if (xenconsoled_fd > -1)
> > >     close(xenconsoled_fd);
> > > if (xenconsoled_slave > -1)
> > >     close(xenconsoled_fd);
> > >
> > > The last line is wrong. It should be:
> > >
> > >     close(xenconsoled_slave);
> >
> > Indeed. Please can you post a patch.
> 
> Attached.

Thanks.

> Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

Ian.

Re: libxl: copy & paste bug

[Stefano Stabellini]

On Tue, 5 Oct 2010, Christoph Egger wrote:
> On Tuesday 05 October 2010 12:08:18 Ian Campbell wrote:
> > On Tue, 2010-10-05 at 11:05 +0100, Christoph Egger wrote:
> > > Hi!
> > >
> > > In tools/libxl/libxl_bootloader.c, at the end of the
> > > function libxl_run_bootloader() are the following lines:
> > >
> > > if (fifo_fd > -1)
> > >     close(fifo_fd);
> > > if (bootloader_fd > -1)
> > >     close(bootloader_fd);
> > > if (xenconsoled_fd > -1)
> > >     close(xenconsoled_fd);
> > > if (xenconsoled_slave > -1)
> > >     close(xenconsoled_fd);
> > >
> > > The last line is wrong. It should be:
> > >
> > >     close(xenconsoled_slave);
> >
> > Indeed. Please can you post a patch.
> 
> Attached.

applied, thanks