This patch fixes misaligned arguments. Signed-off-by: Shi Lei <shi_lei@xxxxxxxxxxxxxx> --- src/remote/remote_daemon.c | 2 +- src/remote/remote_daemon_dispatch.c | 16 +++++++-------- src/remote/remote_driver.c | 31 +++++++++++++++-------------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index c14a561..c67f1b0 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -549,7 +549,7 @@ daemonSetupNetworking(virNetServerPtr srv, (ipsock && config->listen_tls && config->auth_tls == REMOTE_AUTH_SASL) || (ipsock && config->listen_tcp && config->auth_tcp == REMOTE_AUTH_SASL)) { saslCtxt = virNetSASLContextNewServer( - (const char *const*)config->sasl_allowed_username_list); + (const char *const*)config->sasl_allowed_username_list); if (!saslCtxt) goto cleanup; } diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index e62ebfb..50d2079 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -6004,10 +6004,10 @@ remoteDispatchConnectStoragePoolEventRegisterAny(virNetServerPtr server ATTRIBUT static int remoteDispatchConnectStoragePoolEventDeregisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, - remote_connect_storage_pool_event_deregister_any_args *args) + virNetServerClientPtr client, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + remote_connect_storage_pool_event_deregister_any_args *args) { int rv = -1; size_t i; @@ -6246,10 +6246,10 @@ remoteDispatchConnectSecretEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNU static int remoteDispatchConnectSecretEventDeregisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, - remote_connect_secret_event_deregister_any_args *args) + virNetServerClientPtr client, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + remote_connect_secret_event_deregister_any_args *args) { int rv = -1; size_t i; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 3b43e21..58528af 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -326,8 +326,8 @@ remoteDomainBuildEventCallbackBalloonChange(virNetClientProgramPtr prog, static void remoteDomainBuildEventPMSuspendDisk(virNetClientProgramPtr prog, - virNetClientPtr client, - void *evdata, void *opaque); + virNetClientPtr client, + void *evdata, void *opaque); static void remoteDomainBuildEventCallbackPMSuspendDisk(virNetClientProgramPtr prog, virNetClientPtr client, @@ -914,7 +914,7 @@ doRemoteOpen(virConnectPtr conn, } VIR_DEBUG("passing through variable '%s' ('%s') to remote end", - var->name, var->value); + var->name, var->value); } /* Construct the original name. */ @@ -1197,8 +1197,8 @@ doRemoteOpen(virConnectPtr conn, goto failed; if (virNetClientKeepAliveIsSupported(priv->client)) { - priv->serverKeepAlive = remoteConnectSupportsFeatureUnlocked(conn, - priv, VIR_DRV_FEATURE_PROGRAM_KEEPALIVE); + priv->serverKeepAlive = remoteConnectSupportsFeatureUnlocked( + conn, priv, VIR_DRV_FEATURE_PROGRAM_KEEPALIVE); if (!priv->serverKeepAlive) { VIR_INFO("Disabling keepalive protocol since it is not supported" " by the server"); @@ -1239,15 +1239,16 @@ doRemoteOpen(virConnectPtr conn, if (!(priv->eventState = virObjectEventStateNew())) goto failed; - priv->serverEventFilter = remoteConnectSupportsFeatureUnlocked(conn, - priv, VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK); + priv->serverEventFilter = remoteConnectSupportsFeatureUnlocked( + conn, priv, VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK); if (!priv->serverEventFilter) { VIR_INFO("Avoiding server event filtering since it is not " "supported by the server"); } - priv->serverCloseCallback = remoteConnectSupportsFeatureUnlocked(conn, - priv, VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK); + priv->serverCloseCallback = remoteConnectSupportsFeatureUnlocked( + conn, priv, + VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK); if (!priv->serverCloseCallback) { VIR_INFO("Close callback registering isn't supported " "by the remote side."); @@ -2913,9 +2914,9 @@ static int remoteDomainGetBlockJobInfo(virDomainPtr domain, if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_BLOCK_JOB_INFO, (xdrproc_t)xdr_remote_domain_get_block_job_info_args, - (char *)&args, + (char *)&args, (xdrproc_t)xdr_remote_domain_get_block_job_info_ret, - (char *)&ret) == -1) + (char *)&ret) == -1) goto done; if (ret.found) { @@ -2956,9 +2957,9 @@ static int remoteDomainGetBlockIoTune(virDomainPtr domain, if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_BLOCK_IO_TUNE, (xdrproc_t) xdr_remote_domain_get_block_io_tune_args, - (char *) &args, + (char *) &args, (xdrproc_t) xdr_remote_domain_get_block_io_tune_ret, - (char *) &ret) == -1) { + (char *) &ret) == -1) { goto done; } @@ -3426,7 +3427,7 @@ remoteConnectSecretEventRegisterAny(virConnectPtr conn, static int remoteConnectSecretEventDeregisterAny(virConnectPtr conn, - int callbackID) + int callbackID) { struct private_data *priv = conn->privateData; int rv = -1; @@ -8239,7 +8240,7 @@ make_nonnull_network(remote_nonnull_network *net_dst, virNetworkPtr net_src) static void make_nonnull_interface(remote_nonnull_interface *interface_dst, - virInterfacePtr interface_src) + virInterfacePtr interface_src) { interface_dst->name = interface_src->name; interface_dst->mac = interface_src->mac; -- 2.17.1 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list