mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-28 08:35:22 +00:00
00ef048f62
Revert6a1f5f568f
. Now that libvirt_iohelper takes fds by inheritance rather than by open() (commit1eb66479
), there is no longer a race where the parent can unlink() a file prior to the iohelper open()ing the same file. From there, it makes more sense to have the callers both create and unlink, rather than the caller create and the stream unlink, since the latter was only needed when iohelper had to do the unlink. * src/fdstream.h (virFDStreamOpenFile, virFDStreamCreateFile): Callers are responsible for deletion. * src/fdstream.c (virFDStreamOpenFileInternal): Don't leak created file on failure. (virFDStreamOpenFile, virFDStreamCreateFile): Drop parameter. * src/lxc/lxc_driver.c (lxcDomainOpenConsole): Update callers. * src/qemu/qemu_driver.c (qemuDomainScreenshot) (qemuDomainOpenConsole): Likewise. * src/storage/storage_driver.c (storageVolumeDownload) (storageVolumeUpload): Likewise. * src/uml/uml_driver.c (umlDomainOpenConsole): Likewise. * src/vbox/vbox_tmpl.c (vboxDomainScreenshot): Likewise. * src/xen/xen_driver.c (xenUnifiedDomainOpenConsole): Likewise.
49 lines
1.6 KiB
C
49 lines
1.6 KiB
C
/*
|
|
* fdstream.h: generic streams impl for file descriptors
|
|
*
|
|
* Copyright (C) 2009-2011 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
|
|
#ifndef __VIR_FDSTREAM_H_
|
|
# define __VIR_FDSTREAM_H_
|
|
|
|
# include "internal.h"
|
|
# include "command.h"
|
|
|
|
int virFDStreamOpen(virStreamPtr st,
|
|
int fd);
|
|
|
|
int virFDStreamConnectUNIX(virStreamPtr st,
|
|
const char *path,
|
|
bool abstract);
|
|
|
|
int virFDStreamOpenFile(virStreamPtr st,
|
|
const char *path,
|
|
unsigned long long offset,
|
|
unsigned long long length,
|
|
int oflags);
|
|
int virFDStreamCreateFile(virStreamPtr st,
|
|
const char *path,
|
|
unsigned long long offset,
|
|
unsigned long long length,
|
|
int oflags,
|
|
mode_t mode);
|
|
|
|
#endif /* __VIR_FDSTREAM_H_ */
|