External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

admin: Remove flags checking from virAdmConnectOpen public API

Browse Source 
Unlike the previous commit, we do actually support one client-side only flag
VIR_CONNECT_NO_ALIASES, so besides removing the check for flags this flag
has to be masked out before sending a message to the daemon, otherwise it
would trigger an error when checking flags on the daemon side.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Erik Skultety 2016-05-05 13:42:52 +02:00
parent c53595785d
commit 37675f6b66
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/admin/admin_remote.c
View File

@ -162,7 +162,7 @@ remoteAdminConnectOpen(virAdmConnectPtr conn, unsigned int flags)
virObjectLock(priv); virObjectLock(priv);
args.flags = flags; args.flags = flags & ~VIR_CONNECT_NO_ALIASES;
if (virNetClientRegisterAsyncIO(priv->client) < 0) { if (virNetClientRegisterAsyncIO(priv->client) < 0) {
VIR_DEBUG("Failed to add event watch, disabling events and support for" VIR_DEBUG("Failed to add event watch, disabling events and support for"

4
src/libvirt-admin.c
View File

@ -185,7 +185,8 @@ virAdmGetDefaultURI(virConfPtr conf)
/** /**
* virAdmConnectOpen: * virAdmConnectOpen:
* @name: uri of the daemon to connect to, NULL for default * @name: uri of the daemon to connect to, NULL for default
* @flags: extra flags; not used yet, so callers should always pass 0 * @flags: bitwise-OR of virConnectFlags; so far the only supported flag is
* VIR_CONNECT_NO_ALIASES
* *
* Opens connection to admin interface of the daemon. * Opens connection to admin interface of the daemon.
* *
@ -204,7 +205,6 @@ virAdmConnectOpen(const char *name, unsigned int flags)
VIR_DEBUG("flags=%x", flags); VIR_DEBUG("flags=%x", flags);
virResetLastError(); virResetLastError();
virCheckFlagsGoto(VIR_CONNECT_NO_ALIASES, error);
if (!(conn = virAdmConnectNew())) if (!(conn = virAdmConnectNew()))
goto error; goto error;