On Wed, Feb 04, 2015 at 09:32:52PM +0800, Luyao Huang wrote:
> Signed-off-by: Luyao Huang <lhuang@xxxxxxxxxx>
> ---
> src/lxc/lxc_process.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
> index 01da344..b385423 100644
> --- a/src/lxc/lxc_process.c
> +++ b/src/lxc/lxc_process.c
> @@ -1270,11 +1270,6 @@ int virLXCProcessStart(virConnectPtr conn,
> goto error;
> }
>
> - if (VIR_CLOSE(handshakefds[1]) < 0) {
> - virReportSystemError(errno, "%s", _("could not close handshake fd"));
> - goto error;
> - }
> -
> if (virCommandHandshakeWait(cmd) < 0)
> goto error;
ACK, looks like a git merge error
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list