External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-08 22:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote: move open flags enum to sockets header

Browse Source 
This enum will shortly be used by the remote driver sockets helper
methods too.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-05-24 13:53:26 +01:00
parent 94c7a452a1
commit a91f308e05
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/remote/remote_driver.c
View File

@ -650,12 +650,6 @@ static virNetClientProgramEvent qemuEvents[] = {
(xdrproc_t)xdr_qemu_domain_monitor_event_msg }, (xdrproc_t)xdr_qemu_domain_monitor_event_msg },
}; };
enum virDrvOpenRemoteFlags {
VIR_DRV_OPEN_REMOTE_RO = (1 << 0),
VIR_DRV_OPEN_REMOTE_USER = (1 << 1), /* Use the per-user socket path */
VIR_DRV_OPEN_REMOTE_AUTOSTART = (1 << 2), /* Autostart a per-user daemon */
};
static void static void
remoteClientCloseFunc(virNetClient *client G_GNUC_UNUSED, remoteClientCloseFunc(virNetClient *client G_GNUC_UNUSED,
@ -917,7 +911,7 @@ doRemoteOpen(virConnectPtr conn,
*/ */
if (sockname) if (sockname)
proxy = VIR_NET_CLIENT_PROXY_NETCAT; proxy = VIR_NET_CLIENT_PROXY_NETCAT;
else if (flags & VIR_DRV_OPEN_REMOTE_USER) else if (flags & REMOTE_DRIVER_OPEN_USER)
proxy = VIR_NET_CLIENT_PROXY_NATIVE; proxy = VIR_NET_CLIENT_PROXY_NATIVE;
else else
proxy = VIR_NET_CLIENT_PROXY_AUTO; proxy = VIR_NET_CLIENT_PROXY_AUTO;
@ -948,8 +942,8 @@ doRemoteOpen(virConnectPtr conn,
case REMOTE_DRIVER_TRANSPORT_LIBSSH2: case REMOTE_DRIVER_TRANSPORT_LIBSSH2:
if (!sockname && if (!sockname &&
!(sockname = remoteGetUNIXSocket(transport, mode, driver_str, !(sockname = remoteGetUNIXSocket(transport, mode, driver_str,
flags & VIR_DRV_OPEN_REMOTE_RO, flags & REMOTE_DRIVER_OPEN_RO,
flags & VIR_DRV_OPEN_REMOTE_USER, flags & REMOTE_DRIVER_OPEN_USER,
&daemon_name))) &daemon_name)))
goto failed; goto failed;
break; break;
@ -1011,7 +1005,7 @@ doRemoteOpen(virConnectPtr conn,
netcat, netcat,
sockname, sockname,
name, name,
flags & VIR_DRV_OPEN_REMOTE_RO, flags & REMOTE_DRIVER_OPEN_RO,
auth, auth,
conn->uri); conn->uri);
if (!priv->client) if (!priv->client)
@ -1035,7 +1029,7 @@ doRemoteOpen(virConnectPtr conn,
netcat, netcat,
sockname, sockname,
name, name,
flags & VIR_DRV_OPEN_REMOTE_RO, flags & REMOTE_DRIVER_OPEN_RO,
auth, auth,
conn->uri); conn->uri);
if (!priv->client) if (!priv->client)
@ -1046,7 +1040,7 @@ doRemoteOpen(virConnectPtr conn,
#ifndef WIN32 #ifndef WIN32
case REMOTE_DRIVER_TRANSPORT_UNIX: case REMOTE_DRIVER_TRANSPORT_UNIX:
if (flags & VIR_DRV_OPEN_REMOTE_AUTOSTART) { if (flags & REMOTE_DRIVER_OPEN_AUTOSTART) {
const char *env_name = remoteGetDaemonPathEnv(); const char *env_name = remoteGetDaemonPathEnv();
if (!(daemonPath = virFileFindResourceFull(daemon_name, if (!(daemonPath = virFileFindResourceFull(daemon_name,
NULL, NULL, NULL, NULL,
@ -1057,7 +1051,7 @@ doRemoteOpen(virConnectPtr conn,
} }
if (!(priv->client = virNetClientNewUNIX(sockname, if (!(priv->client = virNetClientNewUNIX(sockname,
flags & VIR_DRV_OPEN_REMOTE_AUTOSTART, flags & REMOTE_DRIVER_OPEN_AUTOSTART,
daemonPath))) daemonPath)))
goto failed; goto failed;
@ -1079,7 +1073,7 @@ doRemoteOpen(virConnectPtr conn,
netcat, netcat,
sockname, sockname,
name, name,
flags & VIR_DRV_OPEN_REMOTE_RO))) flags & REMOTE_DRIVER_OPEN_RO)))
goto failed; goto failed;
priv->is_secure = 1; priv->is_secure = 1;
@ -1302,13 +1296,13 @@ remoteConnectOpen(virConnectPtr conn,
goto cleanup; goto cleanup;
if (flags & VIR_CONNECT_RO) if (flags & VIR_CONNECT_RO)
rflags |= VIR_DRV_OPEN_REMOTE_RO; rflags |= REMOTE_DRIVER_OPEN_RO;
remoteGetURIDaemonInfo(conn->uri, transport, &user, &autostart); remoteGetURIDaemonInfo(conn->uri, transport, &user, &autostart);
if (user) if (user)
rflags |= VIR_DRV_OPEN_REMOTE_USER; rflags |= REMOTE_DRIVER_OPEN_USER;
if (autostart) if (autostart)
rflags |= VIR_DRV_OPEN_REMOTE_AUTOSTART; rflags |= REMOTE_DRIVER_OPEN_AUTOSTART;
ret = doRemoteOpen(conn, priv, driver, transport, auth, conf, rflags); ret = doRemoteOpen(conn, priv, driver, transport, auth, conf, rflags);
if (ret != VIR_DRV_OPEN_SUCCESS) { if (ret != VIR_DRV_OPEN_SUCCESS) {

7
src/remote/remote_sockets.h
View File

@ -48,6 +48,13 @@ typedef enum {
REMOTE_DRIVER_MODE_LAST REMOTE_DRIVER_MODE_LAST
} remoteDriverMode; } remoteDriverMode;
typedef enum {
REMOTE_DRIVER_OPEN_RO = (1 << 0), /* Use the read-only socket path */
REMOTE_DRIVER_OPEN_USER = (1 << 1), /* Use the per-user socket path */
REMOTE_DRIVER_OPEN_AUTOSTART = (1 << 2), /* Autostart a per-user daemon */
} remoteDriverOpenFlags;
VIR_ENUM_DECL(remoteDriverMode); VIR_ENUM_DECL(remoteDriverMode);
int int