提交 37675f6b 编写于 作者: E Erik Skultety

admin: Remove flags checking from virAdmConnectOpen public API

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: NErik Skultety <eskultet@redhat.com>
上级 c5359578
...@@ -162,7 +162,7 @@ remoteAdminConnectOpen(virAdmConnectPtr conn, unsigned int flags) ...@@ -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"
......
...@@ -185,7 +185,8 @@ virAdmGetDefaultURI(virConfPtr conf) ...@@ -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) ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册