External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 12:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Add unix socket support to virChrdevOpen

Browse Source 
This also changes the function signature to take a
virDomainChrSourceDefPtr instead of just a path, since it needs to
differentiate behavior based on source->type.
This commit is contained in:
John Eckersberg 2013-01-02 10:38:53 -05:00 committed by Eric Blake
parent 3c971c675a
commit 66a0664974
3 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/conf/virchrdev.c
View File

@ -324,7 +324,7 @@ void virChrdevFree(virChrdevsPtr devs)
* same FD by two processes.
*
* @devs Pointer to private structure holding data about device streams.
* @path Path to the character device to be opened.
* @source Pointer to private structure holding data about device source.
* @st Stream the client wishes to use for the device connection.
* @force On true, close active device streams for the selected character
* device before opening this connection.
@ -334,14 +334,29 @@ void virChrdevFree(virChrdevsPtr devs)
* error and 1 if the device stream is open and busy.
*/
int virChrdevOpen(virChrdevsPtr devs,
const char *path,
virStreamPtr st,
bool force)
virDomainChrSourceDefPtr source,
virStreamPtr st,
bool force)
{
virChrdevStreamInfoPtr cbdata = NULL;
virStreamPtr savedStream;
const char *path;
int ret;
switch (source->type) {
case VIR_DOMAIN_CHR_TYPE_PTY:
path = source->data.file.path;
break;
case VIR_DOMAIN_CHR_TYPE_UNIX:
path = source->data.nix.path;
break;
default:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unsupported device type '%s'"),
virDomainChrTypeToString(source->type));
return -1;
}
virMutexLock(&devs->lock);
if ((savedStream = virHashLookup(devs->hash, path))) {
@ -391,8 +406,21 @@ int virChrdevOpen(virChrdevsPtr devs,
}
/* open the character device */
if (virFDStreamOpenFile(st, path, 0, 0, O_RDWR) < 0)
switch (source->type) {
case VIR_DOMAIN_CHR_TYPE_PTY:
if (virFDStreamOpenFile(st, path, 0, 0, O_RDWR) < 0)
goto error;
break;
case VIR_DOMAIN_CHR_TYPE_UNIX:
if (virFDStreamConnectUNIX(st, path, false) < 0)
goto error;
break;
default:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unsupported device type '%s'"),
virDomainChrTypeToString(source->type));
goto error;
}
/* add cleanup callback */
virFDStreamSetInternalCloseCb(st,

5
src/conf/virchrdev.h
View File

@ -24,6 +24,7 @@
# define __VIR_CHRDEV_H__
# include "internal.h"
# include "domain_conf.h"
typedef struct _virChrdevs virChrdevs;
typedef virChrdevs *virChrdevsPtr;
@ -31,6 +32,6 @@ typedef virChrdevs *virChrdevsPtr;
virChrdevsPtr virChrdevAlloc(void);
void virChrdevFree(virChrdevsPtr devs);
int virChrdevOpen(virChrdevsPtr devs, const char *path,
virStreamPtr st, bool force);
int virChrdevOpen(virChrdevsPtr devs, virDomainChrSourceDefPtr source,
virStreamPtr st, bool force);
#endif /*__VIR_CHRDEV_H__*/

2
src/qemu/qemu_driver.c
View File

@ -12577,7 +12577,7 @@ qemuDomainOpenConsole(virDomainPtr dom,
/* handle mutually exclusive access to console devices */
ret = virChrdevOpen(priv->devs,
chr->source.data.file.path,
&chr->source,
st,
(flags & VIR_DOMAIN_CONSOLE_FORCE) != 0);