[libvirt] [PATCH 00/30] syntax: Remove spaces after casts
According to previous discussions it looks like this is the preferred way of casting. One difference to the previous one is that this time I tuned the regexp a bit so that it doesn't match some macros and assignments and it also matches structs. Feel free to require squashing of some small patches together. Martin Kletzander (30): examples/: Remove spaces after casts access/: Remove spaces after casts admin/: Remove spaces after casts conf/: Remove spaces after casts cpu/: Remove spaces after casts esx/: Remove spaces after casts hyperv/: Remove spaces after casts libxl/: Remove spaces after casts locking/: Remove spaces after casts lxc/: Remove spaces after casts network/: Remove spaces after casts nwfilter/: Remove spaces after casts phyp/: Remove spaces after casts qemu/: Remove spaces after casts remote/: Remove spaces after casts rpc/: Remove spaces after casts security/: Remove spaces after casts storage/: Remove spaces after casts test/: Remove spaces after casts uml/: Remove spaces after casts util/: Remove spaces after casts vbox/: Remove spaces after casts vmx/: Remove spaces after casts vz/: Remove spaces after casts xenapi/: Remove spaces after casts xenconfig/: Remove spaces after casts tests/: Remove spaces after casts tools/: Remove spaces after casts Remove spaces after casts in rest of the files Prohibit space after cast cfg.mk | 6 + docs/hacking.html.in | 9 + examples/object-events/event-test.c | 34 +- src/access/viraccessdriverpolkit.c | 2 +- src/admin/admin_remote.c | 54 +-- src/admin/admin_server_dispatch.c | 8 +- src/conf/cpu_conf.c | 6 +- src/conf/device_conf.c | 2 +- src/conf/domain_audit.c | 4 +- src/conf/domain_conf.c | 88 ++-- src/conf/interface_conf.c | 4 +- src/conf/network_conf.c | 4 +- src/conf/nwfilter_params.c | 4 +- src/conf/storage_conf.c | 48 +- src/conf/virchrdev.c | 4 +- src/conf/virnodedeviceobj.c | 4 +- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 4 +- src/cpu/cpu_ppc64.c | 4 +- src/esx/esx_driver.c | 2 +- src/hyperv/hyperv_driver.c | 8 +- src/hyperv/hyperv_wmi.c | 24 +- src/internal.h | 4 +- src/libvirt-domain.c | 4 +- src/libvirt-host.c | 2 +- src/libvirt-lxc.c | 4 +- src/libvirt-stream.c | 4 +- src/libxl/libxl_conf.c | 4 +- src/locking/lock_driver_sanlock.c | 28 +- src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_controller.c | 4 +- src/lxc/lxc_domain.c | 4 +- src/lxc/lxc_driver.c | 4 +- src/lxc/lxc_monitor.c | 2 +- src/lxc/lxc_native.c | 4 +- src/lxc/lxc_process.c | 4 +- src/network/bridge_driver.c | 4 +- src/nwfilter/nwfilter_dhcpsnoop.c | 6 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_agent.c | 4 +- src/qemu/qemu_alias.c | 2 +- src/qemu/qemu_block.c | 2 +- src/qemu/qemu_capabilities.c | 20 +- src/qemu/qemu_command.c | 18 +- src/qemu/qemu_domain.c | 32 +- src/qemu/qemu_domain_address.c | 12 +- src/qemu/qemu_driver.c | 68 +-- src/qemu/qemu_hostdev.c | 2 +- src/qemu/qemu_hotplug.c | 8 +- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor_json.c | 4 +- src/qemu/qemu_parse_command.c | 6 +- src/qemu/qemu_process.c | 10 +- src/remote/remote_daemon_dispatch.c | 50 +- src/remote/remote_daemon_stream.c | 2 +- src/remote/remote_driver.c | 620 ++++++++++++------------- src/remote/remote_protocol.x | 18 +- src/rpc/virnetclientstream.c | 4 +- src/rpc/virnetserverclient.c | 2 +- src/rpc/virnetserverprogram.c | 2 +- src/rpc/virnetsocket.c | 6 +- src/security/security_apparmor.c | 6 +- src/security/security_dac.c | 42 +- src/security/security_selinux.c | 14 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_gluster.c | 6 +- src/storage/storage_backend_logical.c | 2 +- src/storage/storage_backend_vstorage.c | 6 +- src/storage/storage_driver.c | 6 +- src/storage/storage_util.c | 44 +- src/test/test_driver.c | 4 +- src/uml/uml_driver.c | 6 +- src/util/iohelper.c | 2 +- src/util/viralloc.h | 12 +- src/util/virarptable.c | 2 +- src/util/viratomic.h | 14 +- src/util/virbitmap.c | 4 +- src/util/virbuffer.c | 2 +- src/util/vircgroup.c | 10 +- src/util/vircommand.c | 4 +- src/util/virdnsmasq.c | 2 +- src/util/virfdstream.c | 6 +- src/util/virfile.c | 46 +- src/util/virfirmware.c | 4 +- src/util/virhostcpu.c | 2 +- src/util/virhostmem.c | 8 +- src/util/viridentity.c | 2 +- src/util/virjson.c | 4 +- src/util/virlog.c | 8 +- src/util/virmacaddr.c | 2 +- src/util/virmacmap.c | 2 +- src/util/virnetdev.c | 4 +- src/util/virnetdevtap.c | 2 +- src/util/virobject.c | 2 +- src/util/virpidfile.c | 6 +- src/util/virpolkit.c | 4 +- src/util/virprocess.c | 26 +- src/util/virresctrl.c | 4 +- src/util/virsexpr.c | 8 +- src/util/virstoragefile.c | 8 +- src/util/virstring.c | 14 +- src/util/virsysinfo.c | 2 +- src/util/virsystemd.c | 4 +- src/util/virthreadjob.c | 4 +- src/util/virthreadpool.c | 4 +- src/util/virtime.c | 4 +- src/util/virutil.c | 26 +- src/util/virutil.h | 6 +- src/util/virxml.c | 30 +- src/vbox/vbox_common.c | 4 +- src/vbox/vbox_tmpl.c | 2 +- src/vmx/vmx.c | 4 +- src/vz/vz_utils.h | 2 +- src/xenapi/xenapi_driver.c | 4 +- src/xenconfig/xen_common.c | 4 +- src/xenconfig/xen_xl.c | 2 +- tests/domaincapstest.c | 4 +- tests/qemuhotplugtest.c | 2 +- tests/qemumonitorjsontest.c | 42 +- tests/qemuxml2argvtest.c | 4 +- tests/testutils.c | 2 +- tests/testutils.h | 2 +- tests/testutilshostcpus.h | 88 ++-- tests/virbitmaptest.c | 4 +- tests/vircaps2xmltest.c | 2 +- tests/virfiletest.c | 18 +- tests/virfilewrapper.c | 2 +- tests/virhashtest.c | 8 +- tests/virhostcputest.c | 2 +- tests/virhostdevtest.c | 2 +- tests/virpcimock.c | 2 +- tests/virpcitest.c | 2 +- tests/virresctrltest.c | 2 +- tests/virschematest.c | 2 +- tests/virstoragetest.c | 42 +- tests/virstringtest.c | 12 +- tests/virusbmock.c | 2 +- tools/nss/libvirt_nss.c | 14 +- tools/virsh-domain-monitor.c | 14 +- tools/virsh-domain.c | 16 +- tools/virsh-interface.c | 12 +- tools/virsh-network.c | 10 +- tools/virsh-nodedev.c | 14 +- tools/virsh-nwfilter.c | 6 +- tools/virsh-pool.c | 36 +- tools/virsh-secret.c | 6 +- tools/virsh-util.c | 4 +- tools/virsh-volume.c | 16 +- tools/virt-admin.c | 4 +- tools/vsh.c | 18 +- 152 files changed, 1097 insertions(+), 1082 deletions(-) -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- examples/object-events/event-test.c | 34 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index 8499e0b38e0a..0d7cea688d85 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -59,7 +59,7 @@ connectClose(virConnectPtr conn ATTRIBUTE_UNUSED, static const char * eventToString(int event) { - switch ((virDomainEventType) event) { + switch ((virDomainEventType)event) { case VIR_DOMAIN_EVENT_DEFINED: return "Defined"; @@ -99,9 +99,9 @@ static const char * eventDetailToString(int event, int detail) { - switch ((virDomainEventType) event) { + switch ((virDomainEventType)event) { case VIR_DOMAIN_EVENT_DEFINED: - switch ((virDomainEventDefinedDetailType) detail) { + switch ((virDomainEventDefinedDetailType)detail) { case VIR_DOMAIN_EVENT_DEFINED_ADDED: return "Added"; @@ -120,7 +120,7 @@ eventDetailToString(int event, break; case VIR_DOMAIN_EVENT_UNDEFINED: - switch ((virDomainEventUndefinedDetailType) detail) { + switch ((virDomainEventUndefinedDetailType)detail) { case VIR_DOMAIN_EVENT_UNDEFINED_REMOVED: return "Removed"; @@ -133,7 +133,7 @@ eventDetailToString(int event, break; case VIR_DOMAIN_EVENT_STARTED: - switch ((virDomainEventStartedDetailType) detail) { + switch ((virDomainEventStartedDetailType)detail) { case VIR_DOMAIN_EVENT_STARTED_BOOTED: return "Booted"; @@ -155,7 +155,7 @@ eventDetailToString(int event, break; case VIR_DOMAIN_EVENT_SUSPENDED: - switch ((virDomainEventSuspendedDetailType) detail) { + switch ((virDomainEventSuspendedDetailType)detail) { case VIR_DOMAIN_EVENT_SUSPENDED_PAUSED: return "Paused"; @@ -189,7 +189,7 @@ eventDetailToString(int event, break; case VIR_DOMAIN_EVENT_RESUMED: - switch ((virDomainEventResumedDetailType) detail) { + switch ((virDomainEventResumedDetailType)detail) { case VIR_DOMAIN_EVENT_RESUMED_UNPAUSED: return "Unpaused"; @@ -208,7 +208,7 @@ eventDetailToString(int event, break; case VIR_DOMAIN_EVENT_STOPPED: - switch ((virDomainEventStoppedDetailType) detail) { + switch ((virDomainEventStoppedDetailType)detail) { case VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN: return "Shutdown"; @@ -236,7 +236,7 @@ eventDetailToString(int event, break; case VIR_DOMAIN_EVENT_SHUTDOWN: - switch ((virDomainEventShutdownDetailType) detail) { + switch ((virDomainEventShutdownDetailType)detail) { case VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED: return "Finished"; @@ -252,7 +252,7 @@ eventDetailToString(int event, break; case VIR_DOMAIN_EVENT_PMSUSPENDED: - switch ((virDomainEventPMSuspendedDetailType) detail) { + switch ((virDomainEventPMSuspendedDetailType)detail) { case VIR_DOMAIN_EVENT_PMSUSPENDED_MEMORY: return "Memory"; @@ -265,7 +265,7 @@ eventDetailToString(int event, break; case VIR_DOMAIN_EVENT_CRASHED: - switch ((virDomainEventCrashedDetailType) detail) { + switch ((virDomainEventCrashedDetailType)detail) { case VIR_DOMAIN_EVENT_CRASHED_PANICKED: return "Panicked"; @@ -285,7 +285,7 @@ eventDetailToString(int event, static const char * networkEventToString(int event) { - switch ((virNetworkEventLifecycleType) event) { + switch ((virNetworkEventLifecycleType)event) { case VIR_NETWORK_EVENT_DEFINED: return "Defined"; @@ -347,7 +347,7 @@ guestAgentLifecycleEventReasonToString(int event) static const char * storagePoolEventToString(int event) { - switch ((virStoragePoolEventLifecycleType) event) { + switch ((virStoragePoolEventLifecycleType)event) { case VIR_STORAGE_POOL_EVENT_DEFINED: return "Defined"; case VIR_STORAGE_POOL_EVENT_UNDEFINED: @@ -369,7 +369,7 @@ storagePoolEventToString(int event) static const char * nodeDeviceEventToString(int event) { - switch ((virNodeDeviceEventLifecycleType) event) { + switch ((virNodeDeviceEventLifecycleType)event) { case VIR_NODE_DEVICE_EVENT_CREATED: return "Created"; case VIR_NODE_DEVICE_EVENT_DELETED: @@ -384,7 +384,7 @@ nodeDeviceEventToString(int event) static const char * secretEventToString(int event) { - switch ((virSecretEventLifecycleType) event) { + switch ((virSecretEventLifecycleType)event) { case VIR_SECRET_EVENT_DEFINED: return "Defined"; @@ -871,7 +871,7 @@ myDomainEventDeviceAddedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static const char * blockJobTypeToStr(int type) { - switch ((virDomainBlockJobType) type) { + switch ((virDomainBlockJobType)type) { case VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN: case VIR_DOMAIN_BLOCK_JOB_TYPE_LAST: break; @@ -995,7 +995,7 @@ myDomainEventDeviceRemovalFailedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static const char * metadataTypeToStr(int status) { - switch ((virDomainMetadataType) status) { + switch ((virDomainMetadataType)status) { case VIR_DOMAIN_METADATA_DESCRIPTION: return "description"; -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/access/viraccessdriverpolkit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c index b964cfedff8e..48a83f66d7f8 100644 --- a/src/access/viraccessdriverpolkit.c +++ b/src/access/viraccessdriverpolkit.c @@ -135,7 +135,7 @@ virAccessDriverPolkitCheck(virAccessManagerPtr manager ATTRIBUTE_UNUSED, goto cleanup; VIR_DEBUG("Check action '%s' for process '%lld' time %lld uid %d", - actionid, (long long) pid, startTime, uid); + actionid, (long long)pid, startTime, uid); rv = virPolkitCheckAuth(actionid, pid, -- 2.17.0
On Wed, Apr 25, 2018 at 03:24:39PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/access/viraccessdriverpolkit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/admin/admin_remote.c | 54 +++++++++++++++---------------- src/admin/admin_server_dispatch.c | 8 ++--- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index b29d109f6a29..76217dddfa4d 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -261,8 +261,8 @@ remoteAdminServerGetThreadPoolParameters(virAdmServerPtr srv, virObjectLock(priv); if (call(srv->conn, 0, ADMIN_PROC_SERVER_GET_THREADPOOL_PARAMETERS, - (xdrproc_t)xdr_admin_server_get_threadpool_parameters_args, (char *) &args, - (xdrproc_t)xdr_admin_server_get_threadpool_parameters_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_admin_server_get_threadpool_parameters_args, (char *)&args, + (xdrproc_t)xdr_admin_server_get_threadpool_parameters_ret, (char *)&ret) == -1) goto cleanup; if (virTypedParamsDeserialize((virTypedParameterRemotePtr) ret.params.params_val, @@ -273,7 +273,7 @@ remoteAdminServerGetThreadPoolParameters(virAdmServerPtr srv, goto cleanup; rv = 0; - xdr_free((xdrproc_t)xdr_admin_server_get_threadpool_parameters_ret, (char *) &ret); + xdr_free((xdrproc_t)xdr_admin_server_get_threadpool_parameters_ret, (char *)&ret); cleanup: virObjectUnlock(priv); @@ -296,14 +296,14 @@ remoteAdminServerSetThreadPoolParameters(virAdmServerPtr srv, virObjectLock(priv); if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &args.params.params_val, + (virTypedParameterRemotePtr *)&args.params.params_val, &args.params.params_len, 0) < 0) goto cleanup; if (call(srv->conn, 0, ADMIN_PROC_SERVER_SET_THREADPOOL_PARAMETERS, - (xdrproc_t)xdr_admin_server_set_threadpool_parameters_args, (char *) &args, + (xdrproc_t)xdr_admin_server_set_threadpool_parameters_args, (char *)&args, (xdrproc_t)xdr_void, (char *) NULL) == -1) goto cleanup; @@ -333,8 +333,8 @@ remoteAdminClientGetInfo(virAdmClientPtr client, virObjectLock(priv); if (call(client->srv->conn, 0, ADMIN_PROC_CLIENT_GET_INFO, - (xdrproc_t)xdr_admin_client_get_info_args, (char *) &args, - (xdrproc_t)xdr_admin_client_get_info_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_admin_client_get_info_args, (char *)&args, + (xdrproc_t)xdr_admin_client_get_info_ret, (char *)&ret) == -1) goto cleanup; if (virTypedParamsDeserialize((virTypedParameterRemotePtr) ret.params.params_val, @@ -345,7 +345,7 @@ remoteAdminClientGetInfo(virAdmClientPtr client, goto cleanup; rv = 0; - xdr_free((xdrproc_t)xdr_admin_client_get_info_ret, (char *) &ret); + xdr_free((xdrproc_t)xdr_admin_client_get_info_ret, (char *)&ret); cleanup: virObjectUnlock(priv); @@ -369,10 +369,10 @@ remoteAdminServerGetClientLimits(virAdmServerPtr srv, virObjectLock(priv); if (call(srv->conn, 0, ADMIN_PROC_SERVER_GET_CLIENT_LIMITS, - (xdrproc_t) xdr_admin_server_get_client_limits_args, - (char *) &args, - (xdrproc_t) xdr_admin_server_get_client_limits_ret, - (char *) &ret) == -1) + (xdrproc_t)xdr_admin_server_get_client_limits_args, + (char *)&args, + (xdrproc_t)xdr_admin_server_get_client_limits_ret, + (char *)&ret) == -1) goto cleanup; if (virTypedParamsDeserialize((virTypedParameterRemotePtr) ret.params.params_val, @@ -383,8 +383,8 @@ remoteAdminServerGetClientLimits(virAdmServerPtr srv, goto cleanup; rv = 0; - xdr_free((xdrproc_t) xdr_admin_server_get_client_limits_ret, - (char *) &ret); + xdr_free((xdrproc_t)xdr_admin_server_get_client_limits_ret, + (char *)&ret); cleanup: virObjectUnlock(priv); @@ -407,15 +407,15 @@ remoteAdminServerSetClientLimits(virAdmServerPtr srv, virObjectLock(priv); if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &args.params.params_val, + (virTypedParameterRemotePtr *)&args.params.params_val, &args.params.params_len, 0) < 0) goto cleanup; if (call(srv->conn, 0, ADMIN_PROC_SERVER_SET_CLIENT_LIMITS, - (xdrproc_t) xdr_admin_server_set_client_limits_args, - (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_admin_server_set_client_limits_args, + (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto cleanup; rv = 0; @@ -444,17 +444,17 @@ remoteAdminConnectGetLoggingOutputs(virAdmConnectPtr conn, if (call(conn, 0, ADMIN_PROC_CONNECT_GET_LOGGING_OUTPUTS, - (xdrproc_t) xdr_admin_connect_get_logging_outputs_args, - (char *) &args, - (xdrproc_t) xdr_admin_connect_get_logging_outputs_ret, - (char *) &ret) == -1) + (xdrproc_t)xdr_admin_connect_get_logging_outputs_args, + (char *)&args, + (xdrproc_t)xdr_admin_connect_get_logging_outputs_ret, + (char *)&ret) == -1) goto done; if (outputs) VIR_STEAL_PTR(*outputs, ret.outputs); rv = ret.noutputs; - xdr_free((xdrproc_t) xdr_admin_connect_get_logging_outputs_ret, (char *) &ret); + xdr_free((xdrproc_t)xdr_admin_connect_get_logging_outputs_ret, (char *)&ret); done: virObjectUnlock(priv); @@ -479,10 +479,10 @@ remoteAdminConnectGetLoggingFilters(virAdmConnectPtr conn, if (call(conn, 0, ADMIN_PROC_CONNECT_GET_LOGGING_FILTERS, - (xdrproc_t) xdr_admin_connect_get_logging_filters_args, - (char *) &args, - (xdrproc_t) xdr_admin_connect_get_logging_filters_ret, - (char *) &ret) == -1) + (xdrproc_t)xdr_admin_connect_get_logging_filters_args, + (char *)&args, + (xdrproc_t)xdr_admin_connect_get_logging_filters_ret, + (char *)&ret) == -1) goto done; if (filters) diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dispatch.c index b78ff902c0fa..3e2c52cacad0 100644 --- a/src/admin/admin_server_dispatch.c +++ b/src/admin/admin_server_dispatch.c @@ -214,7 +214,7 @@ adminDispatchServerGetThreadpoolParameters(virNetServerPtr server ATTRIBUTE_UNUS } if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &ret->params.params_val, + (virTypedParameterRemotePtr *)&ret->params.params_val, &ret->params.params_len, 0) < 0) goto cleanup; @@ -297,7 +297,7 @@ adminDispatchClientGetInfo(virNetServerPtr server ATTRIBUTE_UNUSED, if (!(clnt = virNetServerGetClient(srv, args->clnt.id))) { virReportError(VIR_ERR_NO_CLIENT, _("no client with matching id '%llu' found"), - (unsigned long long) args->clnt.id); + (unsigned long long)args->clnt.id); goto cleanup; } @@ -313,7 +313,7 @@ adminDispatchClientGetInfo(virNetServerPtr server ATTRIBUTE_UNUSED, } if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &ret->params.params_val, + (virTypedParameterRemotePtr *)&ret->params.params_val, &ret->params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) goto cleanup; @@ -360,7 +360,7 @@ adminDispatchServerGetClientLimits(virNetServerPtr server ATTRIBUTE_UNUSED, } if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &ret->params.params_val, + (virTypedParameterRemotePtr *)&ret->params.params_val, &ret->params.params_len, 0) < 0) goto cleanup; -- 2.17.0
On Wed, 2018-04-25 at 15:24 +0200, Martin Kletzander wrote:
if (call(srv->conn, 0, ADMIN_PROC_SERVER_SET_THREADPOOL_PARAMETERS, - (xdrproc_t)xdr_admin_server_set_threadpool_parameters_args, (char *) &args, + (xdrproc_t)xdr_admin_server_set_threadpool_parameters_args, (char *)&args, (xdrproc_t)xdr_void, (char *) NULL) == -1) goto cleanup;
Missed '(char *) NULL' here, and again later on. The regex probably needs some tweaking. -- Andrea Bolognani / Red Hat / Virtualization
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/conf/cpu_conf.c | 6 +-- src/conf/device_conf.c | 2 +- src/conf/domain_audit.c | 4 +- src/conf/domain_conf.c | 88 ++++++++++++++++++------------------- src/conf/interface_conf.c | 4 +- src/conf/network_conf.c | 4 +- src/conf/nwfilter_params.c | 4 +- src/conf/storage_conf.c | 48 ++++++++++---------- src/conf/virchrdev.c | 4 +- src/conf/virnodedeviceobj.c | 4 +- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 4 +- 12 files changed, 87 insertions(+), 87 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 43a3ab5dcdfa..ca42760c38ba 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -448,21 +448,21 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, _("Missing 'sockets' attribute in CPU topology")); goto cleanup; } - def->sockets = (unsigned int) ul; + def->sockets = (unsigned int)ul; if (virXPathULong("string(./topology[1]/@cores)", ctxt, &ul) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing 'cores' attribute in CPU topology")); goto cleanup; } - def->cores = (unsigned int) ul; + def->cores = (unsigned int)ul; if (virXPathULong("string(./topology[1]/@threads)", ctxt, &ul) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing 'threads' attribute in CPU topology")); goto cleanup; } - def->threads = (unsigned int) ul; + def->threads = (unsigned int)ul; if (!def->sockets || !def->cores || !def->threads) { virReportError(VIR_ERR_XML_ERROR, "%s", diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index d69f94fadf14..c408dee9541a 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -81,7 +81,7 @@ virDomainDeviceInfoAddressIsEqual(const virDomainDeviceInfo *a, if (a->type != b->type) return false; - switch ((virDomainDeviceAddressType) a->type) { + switch ((virDomainDeviceAddressType)a->type) { case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST: /* address types below don't have any specific data */ diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 82868bca76b0..b5fd1cafbcb8 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -162,7 +162,7 @@ virDomainAuditSmartcard(virDomainObjPtr vm, size_t i; if (def) { - switch ((virDomainSmartcardType) def->type) { + switch ((virDomainSmartcardType)def->type) { case VIR_DOMAIN_SMARTCARD_TYPE_HOST: virDomainAuditGenericDev(vm, "smartcard", NULL, "nss-smartcard-device", @@ -1004,7 +1004,7 @@ virDomainAuditInput(virDomainObjPtr vm, if (!(vmname = virAuditEncode("vm", vm->def->name))) goto no_memory; - switch ((virDomainInputType) input->type) { + switch ((virDomainInputType)input->type) { case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b0257068dabb..9c4a6b7f968e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1421,7 +1421,7 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def) const char *virDomainInputDefGetPath(virDomainInputDefPtr input) { - switch ((virDomainInputType) input->type) { + switch ((virDomainInputType)input->type) { case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: @@ -1896,7 +1896,7 @@ virDomainControllerDefNew(virDomainControllerType type) def->model = -1; def->idx = -1; - switch ((virDomainControllerType) def->type) { + switch ((virDomainControllerType)def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: def->opts.vioserial.ports = -1; def->opts.vioserial.vectors = -1; @@ -2117,7 +2117,7 @@ virDomainChrSourceDefGetPath(virDomainChrSourceDefPtr chr) if (!chr) return NULL; - switch ((virDomainChrType) chr->type) { + switch ((virDomainChrType)chr->type) { case VIR_DOMAIN_CHR_TYPE_PTY: case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_FILE: @@ -2558,7 +2558,7 @@ void virDomainHostdevDefClear(virDomainHostdevDefPtr def) switch (def->mode) { case VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES: - switch ((virDomainHostdevCapsType) def->source.caps.type) { + switch ((virDomainHostdevCapsType)def->source.caps.type) { case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: VIR_FREE(def->source.caps.u.storage.block); break; @@ -2574,7 +2574,7 @@ void virDomainHostdevDefClear(virDomainHostdevDefPtr def) } break; case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: - switch ((virDomainHostdevSubsysType) def->source.subsys.type) { + switch ((virDomainHostdevSubsysType)def->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: virDomainHostdevSubsysSCSIClear(&def->source.subsys.u.scsi); break; @@ -2673,7 +2673,7 @@ void virDomainDeviceDefFree(virDomainDeviceDefPtr def) if (!def) return; - switch ((virDomainDeviceType) def->type) { + switch ((virDomainDeviceType)def->type) { case VIR_DOMAIN_DEVICE_DISK: virDomainDiskDefFree(def->data.disk); break; @@ -3566,7 +3566,7 @@ int virDomainDeviceAddressIsValid(virDomainDeviceInfoPtr info, virDomainDeviceInfoPtr virDomainDeviceGetInfo(virDomainDeviceDefPtr device) { - switch ((virDomainDeviceType) device->type) { + switch ((virDomainDeviceType)device->type) { case VIR_DOMAIN_DEVICE_DISK: return &device->data.disk->info; case VIR_DOMAIN_DEVICE_FS: @@ -3812,7 +3812,7 @@ virDomainDeviceInfoIterateInternal(virDomainDefPtr def, * statement has no real function here and should be optimized out by the * compiler. */ i = VIR_DOMAIN_DEVICE_LAST; - switch ((virDomainDeviceType) i) { + switch ((virDomainDeviceType)i) { case VIR_DOMAIN_DEVICE_DISK: case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_FS: @@ -4086,7 +4086,7 @@ virDomainDefAddConsoleCompat(virDomainDefPtr def) } else if (def->os.type == VIR_DOMAIN_OSTYPE_HVM && def->nserials > 0 && def->serials[0]->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL) { - switch ((virDomainChrSerialTargetType) def->serials[0]->targetType) { + switch ((virDomainChrSerialTargetType)def->serials[0]->targetType) { case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM: @@ -5252,7 +5252,7 @@ static int virDomainChrSourceDefValidate(const virDomainChrSourceDef *def, const virDomainChrDef *chr_def) { - switch ((virDomainChrType) def->type) { + switch ((virDomainChrType)def->type) { case VIR_DOMAIN_CHR_TYPE_NULL: case VIR_DOMAIN_CHR_TYPE_PTY: case VIR_DOMAIN_CHR_TYPE_VC: @@ -5451,7 +5451,7 @@ static int virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev) { if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) { - switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) { + switch ((virDomainHostdevSubsysType)hostdev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { @@ -5512,7 +5512,7 @@ static int virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev, const virDomainDef *def) { - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: return virDomainDiskDefValidate(dev->data.disk); @@ -5602,7 +5602,7 @@ virDomainDeviceDefValidateAliasesIterator(virDomainDefPtr def, return -1; } - if (virHashAddEntry(data->aliases, alias, (void *) 1) < 0) { + if (virHashAddEntry(data->aliases, alias, (void *)1) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to construct table of device aliases")); return -1; @@ -6124,7 +6124,7 @@ virDomainDeviceInfoFormat(virBufferPtr buf, virBufferAsprintf(buf, "<address type='%s'", virDomainDeviceAddressTypeToString(info->type)); - switch ((virDomainDeviceAddressType) info->type) { + switch ((virDomainDeviceAddressType)info->type) { case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: if (!virPCIDeviceAddressIsEmpty(&info->addr.pci)) { virBufferAsprintf(buf, " domain='0x%.4x' bus='0x%.2x' " @@ -6534,7 +6534,7 @@ virDomainDeviceBootParseXML(xmlNodePtr node, goto cleanup; } - if (virHashAddEntry(bootHash, order, (void *) 1) < 0) + if (virHashAddEntry(bootHash, order, (void *)1) < 0) goto cleanup; } @@ -6650,7 +6650,7 @@ virDomainDeviceAddressParseXML(xmlNodePtr address, goto cleanup; } - switch ((virDomainDeviceAddressType) info->type) { + switch ((virDomainDeviceAddressType)info->type) { case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: if (virPCIDeviceAddressParseXML(address, &info->addr.pci) < 0) goto cleanup; @@ -7384,7 +7384,7 @@ virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode, goto cleanup; } - switch ((virDomainHostdevSubsysSCSIHostProtocolType) hostsrc->protocol) { + switch ((virDomainHostdevSubsysSCSIHostProtocolType)hostsrc->protocol) { case VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_VHOST: if (!(wwpn = virXMLPropString(sourcenode, "wwpn"))) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -11692,7 +11692,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, static int virDomainChrDefaultTargetType(int devtype) { - switch ((virDomainChrDeviceType) devtype) { + switch ((virDomainChrDeviceType)devtype) { case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: virReportError(VIR_ERR_XML_ERROR, _("target type must be specified for %s device"), @@ -11723,7 +11723,7 @@ virDomainChrTargetTypeFromString(int devtype, if (!targetType) return virDomainChrDefaultTargetType(devtype); - switch ((virDomainChrDeviceType) devtype) { + switch ((virDomainChrDeviceType)devtype) { case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: ret = virDomainChrChannelTargetTypeFromString(targetType); break; @@ -11755,7 +11755,7 @@ virDomainChrTargetModelFromString(int devtype, if (!targetModel) return 0; - switch ((virDomainChrDeviceType) devtype) { + switch ((virDomainChrDeviceType)devtype) { case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL: ret = virDomainChrSerialTargetModelTypeFromString(targetModel); break; @@ -12148,7 +12148,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, } sourceParsed++; - switch ((virDomainChrType) def->type) { + switch ((virDomainChrType)def->type) { case VIR_DOMAIN_CHR_TYPE_FILE: if (virDomainChrSourceDefParseFile(def, cur) < 0) goto error; @@ -12370,7 +12370,7 @@ virDomainChrDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } - nodeName = (const char *) node->name; + nodeName = (const char *)node->name; if ((def->deviceType = virDomainChrDeviceTypeFromString(nodeName)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown character device type: %s"), @@ -15103,7 +15103,7 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } if (def->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) { - switch ((virDomainHostdevSubsysType) def->source.subsys.type) { + switch ((virDomainHostdevSubsysType)def->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: if (virXPathBoolean("boolean(./readonly)", ctxt)) def->readonly = true; @@ -15763,7 +15763,7 @@ virDomainDeviceDefParse(const char *xmlStr, if (VIR_ALLOC(dev) < 0) goto error; - if ((dev->type = virDomainDeviceTypeFromString((const char *) node->name)) < 0) { + if ((dev->type = virDomainDeviceTypeFromString((const char *)node->name)) < 0) { /* Some crazy mapping of serial, parallel, console and channel to * VIR_DOMAIN_DEVICE_CHR. */ if (virXMLNodeNameEqual(node, "channel") || @@ -15779,7 +15779,7 @@ virDomainDeviceDefParse(const char *xmlStr, } } - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: if (!(dev->data.disk = virDomainDiskDefParseXML(xmlopt, node, ctxt, NULL, def->seclabels, @@ -16087,7 +16087,7 @@ virDomainHostdevMatchSubsys(virDomainHostdevDefPtr a, if (a->source.subsys.type != b->source.subsys.type) return 0; - switch ((virDomainHostdevSubsysType) a->source.subsys.type) { + switch ((virDomainHostdevSubsysType)a->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: return virDomainHostdevMatchSubsysPCI(a, b); case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: @@ -16785,11 +16785,11 @@ virDomainChrEquals(virDomainChrDefPtr src, !virDomainChrSourceDefIsEqual(src->source, tgt->source)) return false; - switch ((virDomainChrDeviceType) src->deviceType) { + switch ((virDomainChrDeviceType)src->deviceType) { case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: if (src->targetType != tgt->targetType) return false; - switch ((virDomainChrChannelTargetType) src->targetType) { + switch ((virDomainChrChannelTargetType)src->targetType) { case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN: case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: return STREQ_NULLABLE(src->target.name, tgt->target.name); @@ -16901,7 +16901,7 @@ virDomainChrGetDomainPtrs(const virDomainDef *vmdef, *arrPtr = NULL; *cntPtr = 0; } else { - *arrPtr = (const virDomainChrDef **) *arrVar; + *arrPtr = (const virDomainChrDef **)*arrVar; *cntPtr = *cntVar; } } @@ -17994,7 +17994,7 @@ virDomainLoaderDefParseXML(xmlNodePtr node, readonly_str = virXMLPropString(node, "readonly"); secure_str = virXMLPropString(node, "secure"); type_str = virXMLPropString(node, "type"); - loader->path = (char *) xmlNodeGetContent(node); + loader->path = (char *)xmlNodeGetContent(node); if (readonly_str && (loader->readonly = virTristateBoolTypeFromString(readonly_str)) <= 0) { @@ -20668,7 +20668,7 @@ virDomainDeviceInfoCheckABIStability(virDomainDeviceInfoPtr src, return false; } - switch ((virDomainDeviceAddressType) src->type) { + switch ((virDomainDeviceAddressType)src->type) { case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: if (src->addr.pci.domain != dst->addr.pci.domain || src->addr.pci.bus != dst->addr.pci.bus || @@ -22313,7 +22313,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDefPtr src, * also have to add an check above. Otherwise the switch statement has no * real function here and should be optimized out by the compiler. */ i = VIR_DOMAIN_DEVICE_LAST; - switch ((virDomainDeviceType) i) { + switch ((virDomainDeviceType)i) { case VIR_DOMAIN_DEVICE_DISK: case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_FS: @@ -22463,7 +22463,7 @@ virDomainDefMaybeAddSmartcardController(virDomainDefPtr def) virDomainDeviceInfoPtr info = &def->smartcards[j]->info; if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID && info->addr.ccid.controller == 0 && - (int) info->addr.ccid.slot > max) + (int)info->addr.ccid.slot > max) max = info->addr.ccid.slot; } smartcard->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID; @@ -24575,7 +24575,7 @@ virDomainChrTargetDefFormat(virBufferPtr buf, const char *targetType = virDomainChrTargetTypeToString(def->deviceType, def->targetType); - switch ((virDomainChrDeviceType) def->deviceType) { + switch ((virDomainChrDeviceType)def->deviceType) { case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: { if (!targetType) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -26587,7 +26587,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, xmlIndentTreeOutput = oldIndentTreeOutput; goto error; } - virBufferAsprintf(buf, "%s\n", (char *) xmlBufferContent(xmlbuf)); + virBufferAsprintf(buf, "%s\n", (char *)xmlBufferContent(xmlbuf)); xmlBufferFree(xmlbuf); xmlIndentTreeOutput = oldIndentTreeOutput; } @@ -28357,7 +28357,7 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src, int rc = -1; char *netprefix; - switch ((virDomainDeviceType) src->type) { + switch ((virDomainDeviceType)src->type) { case VIR_DOMAIN_DEVICE_DISK: rc = virDomainDiskDefFormat(&buf, src->data.disk, flags, xmlopt); break; @@ -28548,7 +28548,7 @@ virDomainObjGetMetadata(virDomainObjPtr vm, if (!(def = virDomainObjGetOneDef(vm, flags))) goto cleanup; - switch ((virDomainMetadataType) type) { + switch ((virDomainMetadataType)type) { case VIR_DOMAIN_METADATA_DESCRIPTION: if (VIR_STRDUP(ret, def->description) < 0) goto cleanup; @@ -28600,7 +28600,7 @@ virDomainDefSetMetadata(virDomainDefPtr def, goto cleanup; } - switch ((virDomainMetadataType) type) { + switch ((virDomainMetadataType)type) { case VIR_DOMAIN_METADATA_DESCRIPTION: if (VIR_STRDUP(tmp, metadata) < 0) goto cleanup; @@ -28776,21 +28776,21 @@ virDomainDefGetShortName(const virDomainDef *def) * characters. The same applies for illegal sequences as they can occur * with incompatible locales. */ len = mbstowcs(NULL, def->name, 0); - if ((len == (size_t) -1 && errno == EILSEQ) || + if ((len == (size_t)-1 && errno == EILSEQ) || len == strlen(def->name)) { ignore_value(virAsprintf(&ret, "%d-%.*s", def->id, VIR_DOMAIN_SHORT_NAME_MAX, def->name)); return ret; } - if (len == (size_t) -1) { + if (len == (size_t)-1) { virReportSystemError(errno, "%s", _("Cannot convert domain name to " "wide character string")); return NULL; } - if (mbstowcs(wshortname, def->name, VIR_DOMAIN_SHORT_NAME_MAX) == (size_t) -1) { + if (mbstowcs(wshortname, def->name, VIR_DOMAIN_SHORT_NAME_MAX) == (size_t)-1) { virReportSystemError(errno, "%s", _("Cannot convert domain name to " "wide character string")); @@ -28798,7 +28798,7 @@ virDomainDefGetShortName(const virDomainDef *def) } len = wcstombs(NULL, wshortname, 0); - if (len == (size_t) -1) { + if (len == (size_t)-1) { virReportSystemError(errno, "%s", _("Cannot convert wide character string " "back to multi-byte domain name")); @@ -28808,7 +28808,7 @@ virDomainDefGetShortName(const virDomainDef *def) if (VIR_ALLOC_N(shortname, len + 1) < 0) return NULL; - if (wcstombs(shortname, wshortname, len) == (size_t) -1) { + if (wcstombs(shortname, wshortname, len) == (size_t)-1) { virReportSystemError(errno, "%s", _("Cannot convert wide character string " "back to multi-byte domain name")); @@ -29305,7 +29305,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def) virStorageAuthDefFree(def->src->auth); def->src->auth = NULL; - switch ((virStoragePoolType) pooldef->type) { + switch ((virStoragePoolType)pooldef->type) { case VIR_STORAGE_POOL_DIR: case VIR_STORAGE_POOL_FS: case VIR_STORAGE_POOL_NETFS: diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 0a4b28f489fa..aec756e083ef 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -146,7 +146,7 @@ virInterfaceDefParseMtu(virInterfaceDefPtr def, "%s", _("interface mtu value is improper")); return -1; } else if (ret == 0) { - def->mtu = (unsigned int) mtu; + def->mtu = (unsigned int)mtu; } return 0; } @@ -305,7 +305,7 @@ virInterfaceDefParseIP(virInterfaceIPDefPtr def, if (tmp != NULL) { ret = virXPathLong("string(./@prefix)", ctxt, &l); if (ret == 0) { - def->prefix = (int) l; + def->prefix = (int)l; } else if (ret == -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Invalid ip address prefix value")); diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 630a87fc07f7..96c31d6184cd 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -611,7 +611,7 @@ virNetworkDNSHostDefParseXML(const char *networkName, if (cur->type == XML_ELEMENT_NODE && virXMLNodeNameEqual(cur, "hostname")) { if (cur->children != NULL) { - char *name = (char *) xmlNodeGetContent(cur); + char *name = (char *)xmlNodeGetContent(cur); if (!name) { virReportError(VIR_ERR_XML_DETAIL, @@ -2384,7 +2384,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, xmlIndentTreeOutput = oldIndentTreeOutput; goto error; } - virBufferAsprintf(buf, "%s\n", (char *) xmlBufferContent(xmlbuf)); + virBufferAsprintf(buf, "%s\n", (char *)xmlBufferContent(xmlbuf)); xmlBufferFree(xmlbuf); xmlIndentTreeOutput = oldIndentTreeOutput; } diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 3a010491826a..8a3fd075388c 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -762,8 +762,8 @@ virNWFilterHashTablePutAll(virNWFilterHashTablePtr src, static int virNWFilterVarValueCompare(const void *a, const void *b) { - return virNWFilterVarValueEqual((const virNWFilterVarValue *) a, - (const virNWFilterVarValue *) b) ? 0 : 1; + return virNWFilterVarValueEqual((const virNWFilterVarValue *)a, + (const virNWFilterVarValue *)b) ? 0 : 1; } bool diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 5036ab9ef8a0..8b3c25344bec 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -606,9 +606,9 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, node = virXPathNode(permxpath, ctxt); if (node == NULL) { /* Set default values if there is not <permissions> element */ - perms->mode = (mode_t) -1; - perms->uid = (uid_t) -1; - perms->gid = (gid_t) -1; + perms->mode = (mode_t)-1; + perms->uid = (uid_t)-1; + perms->gid = (gid_t)-1; perms->label = NULL; return 0; } @@ -628,11 +628,11 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, perms->mode = tmp; VIR_FREE(mode); } else { - perms->mode = (mode_t) -1; + perms->mode = (mode_t)-1; } if (virXPathNode("./owner", ctxt) == NULL) { - perms->uid = (uid_t) -1; + perms->uid = (uid_t)-1; } else { /* We previously could output -1, so continue to parse it */ if (virXPathLongLong("number(./owner)", ctxt, &val) < 0 || @@ -647,11 +647,11 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, } if (virXPathNode("./group", ctxt) == NULL) { - perms->gid = (gid_t) -1; + perms->gid = (gid_t)-1; } else { /* We previously could output -1, so continue to parse it */ if (virXPathLongLong("number(./group)", ctxt, &val) < 0 || - ((gid_t) val != val && + ((gid_t)val != val && val != -1)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("malformed group element")); @@ -1010,21 +1010,21 @@ virStoragePoolDefFormatBuf(virBufferPtr buf, virBufferEscapeString(buf, "<path>%s</path>\n", def->target.path); - if (def->target.perms.mode != (mode_t) -1 || - def->target.perms.uid != (uid_t) -1 || - def->target.perms.gid != (gid_t) -1 || + if (def->target.perms.mode != (mode_t)-1 || + def->target.perms.uid != (uid_t)-1 || + def->target.perms.gid != (gid_t)-1 || def->target.perms.label) { virBufferAddLit(buf, "<permissions>\n"); virBufferAdjustIndent(buf, 2); - if (def->target.perms.mode != (mode_t) -1) + if (def->target.perms.mode != (mode_t)-1) virBufferAsprintf(buf, "<mode>0%o</mode>\n", def->target.perms.mode); - if (def->target.perms.uid != (uid_t) -1) + if (def->target.perms.uid != (uid_t)-1) virBufferAsprintf(buf, "<owner>%d</owner>\n", - (int) def->target.perms.uid); - if (def->target.perms.gid != (gid_t) -1) + (int)def->target.perms.uid); + if (def->target.perms.gid != (gid_t)-1) virBufferAsprintf(buf, "<group>%d</group>\n", - (int) def->target.perms.gid); + (int)def->target.perms.gid); virBufferEscapeString(buf, "<label>%s</label>\n", def->target.perms.label); @@ -1334,7 +1334,7 @@ virStorageVolTimestampFormat(virBufferPtr buf, const char *name, if (ts->tv_nsec < 0) return; virBufferAsprintf(buf, "<%s>%llu", name, - (unsigned long long) ts->tv_sec); + (unsigned long long)ts->tv_sec); if (ts->tv_nsec) virBufferAsprintf(buf, ".%09ld", ts->tv_nsec); virBufferAsprintf(buf, "</%s>\n", name); @@ -1364,22 +1364,22 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, } if (def->perms && - (def->perms->mode != (mode_t) -1 || - def->perms->uid != (uid_t) -1 || - def->perms->gid != (gid_t) -1 || + (def->perms->mode != (mode_t)-1 || + def->perms->uid != (uid_t)-1 || + def->perms->gid != (gid_t)-1 || def->perms->label)) { virBufferAddLit(buf, "<permissions>\n"); virBufferAdjustIndent(buf, 2); - if (def->perms->mode != (mode_t) -1) + if (def->perms->mode != (mode_t)-1) virBufferAsprintf(buf, "<mode>0%o</mode>\n", def->perms->mode); - if (def->perms->uid != (uid_t) -1) + if (def->perms->uid != (uid_t)-1) virBufferAsprintf(buf, "<owner>%d</owner>\n", - (int) def->perms->uid); - if (def->perms->gid != (gid_t) -1) + (int)def->perms->uid); + if (def->perms->gid != (gid_t)-1) virBufferAsprintf(buf, "<group>%d</group>\n", - (int) def->perms->gid); + (int)def->perms->gid); virBufferEscapeString(buf, "<label>%s</label>\n", def->perms->label); diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 416a7a129c78..afdcd97e567f 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -128,7 +128,7 @@ static int virChrdevLockFileCreate(const char *dev) virReportError(VIR_ERR_OPERATION_FAILED, _("Requested device '%s' is locked by " "lock file '%s' held by process %lld"), - dev, path, (long long) pid); + dev, path, (long long)pid); goto cleanup; } else { /* clean up the stale/corrupted/nonexistent lockfile */ @@ -138,7 +138,7 @@ static int virChrdevLockFileCreate(const char *dev) /* ensure correct format according to filesystem hierarchy standard */ /* http://www.pathname.com/fhs/pub/fhs-2.3.html#VARLOCKLOCKFILES */ - if (virAsprintf(&pidStr, "%10lld\n", (long long) getpid()) < 0) + if (virAsprintf(&pidStr, "%10lld\n", (long long)getpid()) < 0) goto cleanup; /* create the lock file */ diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 13e9a1751851..d894093dbb7d 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -258,7 +258,7 @@ virNodeDeviceObjListFindByWWNsCallback(const void *payload, { virNodeDeviceObjPtr obj = (virNodeDeviceObjPtr) payload; struct virNodeDeviceObjListFindByWWNsData *data = - (struct virNodeDeviceObjListFindByWWNsData *) opaque; + (struct virNodeDeviceObjListFindByWWNsData *)opaque; virNodeDevCapsDefPtr cap; int want = 0; @@ -356,7 +356,7 @@ virNodeDeviceObjListFindSCSIHostByWWNsCallback(const void *payload, { virNodeDeviceObjPtr obj = (virNodeDeviceObjPtr) payload; struct virNodeDeviceObjListFindSCSIHostByWWNsData *data = - (struct virNodeDeviceObjListFindSCSIHostByWWNsData *) opaque; + (struct virNodeDeviceObjListFindSCSIHostByWWNsData *)opaque; virNodeDevCapsDefPtr cap; int want = 0; diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 48ce3c814178..7ad6196a3add 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -203,7 +203,7 @@ virSecretObjSearchName(const void *payload, { virSecretObjPtr obj = (virSecretObjPtr) payload; virSecretDefPtr def; - struct virSecretSearchData *data = (struct virSecretSearchData *) opaque; + struct virSecretSearchData *data = (struct virSecretSearchData *)opaque; int found = 0; virObjectLock(obj); diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 6c937f105ca9..54535a799fe3 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -754,7 +754,7 @@ virStoragePoolObjSearchVolumeCb(const void *payload, { virStorageVolObjPtr volobj = (virStorageVolObjPtr) payload; struct _virStoragePoolObjSearchVolData *data = - (struct _virStoragePoolObjSearchVolData *) opaque; + (struct _virStoragePoolObjSearchVolData *)opaque; int found = 0; virObjectLock(volobj); @@ -1812,7 +1812,7 @@ virStoragePoolObjSourceFindDuplicateCb(const void *payload, { virStoragePoolObjPtr obj = (virStoragePoolObjPtr) payload; struct _virStoragePoolObjFindDuplicateData *data = - (struct _virStoragePoolObjFindDuplicateData *) opaque; + (struct _virStoragePoolObjFindDuplicateData *)opaque; /* Don't match against ourself if re-defining existing pool ! */ if (STREQ(obj->def->name, data->def->name)) -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/cpu/cpu_ppc64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 76582d4083bb..c79442c23bbd 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -94,7 +94,7 @@ ppc64CheckCompatibilityMode(const char *host_model, /* Valid host CPUs: POWER6, POWER7, POWER8, POWER9 */ if (!STRPREFIX(host_model, "POWER") || - !(tmp = (char *) host_model + strlen("POWER")) || + !(tmp = (char *)host_model + strlen("POWER")) || virStrToLong_i(tmp, NULL, 10, &host) < 0 || host < 6 || host > 9) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -105,7 +105,7 @@ ppc64CheckCompatibilityMode(const char *host_model, /* Valid compatibility modes: power6, power7, power8, power9 */ if (!STRPREFIX(compat_mode, "power") || - !(tmp = (char *) compat_mode + strlen("power")) || + !(tmp = (char *)compat_mode + strlen("power")) || virStrToLong_i(tmp, NULL, 10, &compat) < 0 || compat < 6 || compat > 9) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/esx/esx_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index c682c800caaf..60aa5fc25294 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -3981,7 +3981,7 @@ esxNodeGetFreeMemory(virConnectPtr conn) goto cleanup; } - usageBytes = (unsigned long long) (memoryUsage->value) * 1048576; + usageBytes = (unsigned long long)(memoryUsage->value) * 1048576; result = memorySize->value - usageBytes; cleanup: -- 2.17.0
On Wed, Apr 25, 2018 at 03:24:43PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/esx/esx_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/hyperv/hyperv_driver.c | 8 ++++---- src/hyperv/hyperv_wmi.c | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index d02c0ac3734e..95496bdf7311 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -1466,8 +1466,8 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int codeset, cleanup: VIR_FREE(translatedKeycodes); VIR_FREE(selector); - hypervFreeObject(priv, (hypervObject *) keyboard); - hypervFreeObject(priv, (hypervObject *) computerSystem); + hypervFreeObject(priv, (hypervObject *)keyboard); + hypervFreeObject(priv, (hypervObject *)computerSystem); virBufferFreeAndReset(&query); return result; } @@ -1572,8 +1572,8 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory, virBufferFreeAndReset(&eprQuery); cleanup: VIR_FREE(memory_str); - hypervFreeObject(priv, (hypervObject *) vssd); - hypervFreeObject(priv, (hypervObject *) memsd); + hypervFreeObject(priv, (hypervObject *)vssd); + hypervFreeObject(priv, (hypervObject *)memsd); return result; } diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 5e2b3d7edf5b..0f39bd443134 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -907,7 +907,7 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokeParamsListPtr params, case MSVM_CONCRETEJOB_JOBSTATE_STARTING: case MSVM_CONCRETEJOB_JOBSTATE_RUNNING: case MSVM_CONCRETEJOB_JOBSTATE_SHUTTING_DOWN: - hypervFreeObject(priv, (hypervObject *) job); + hypervFreeObject(priv, (hypervObject *)job); job = NULL; usleep(100 * 1000); /* sleep 100 ms */ timeout -= 100; @@ -955,7 +955,7 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokeParamsListPtr params, VIR_FREE(returnValue); VIR_FREE(instanceID); virBufferFreeAndReset(&query); - hypervFreeObject(priv, (hypervObject *) job); + hypervFreeObject(priv, (hypervObject *)job); hypervFreeInvokeParams(params); return result; } @@ -1254,7 +1254,7 @@ hypervGetMsvmComputerSystemList(hypervPrivate *priv, virBufferPtr query, Msvm_ComputerSystem **list) { return hypervGetWmiClassList(priv, Msvm_ComputerSystem_WmiInfo, query, - (hypervObject **) list); + (hypervObject **)list); } int @@ -1262,7 +1262,7 @@ hypervGetMsvmConcreteJobList(hypervPrivate *priv, virBufferPtr query, Msvm_ConcreteJob **list) { return hypervGetWmiClassList(priv, Msvm_ConcreteJob_WmiInfo, query, - (hypervObject **) list); + (hypervObject **)list); } int @@ -1270,7 +1270,7 @@ hypervGetWin32ComputerSystemList(hypervPrivate *priv, virBufferPtr query, Win32_ComputerSystem **list) { return hypervGetWmiClassList(priv, Win32_ComputerSystem_WmiInfo, query, - (hypervObject **) list); + (hypervObject **)list); } int @@ -1278,7 +1278,7 @@ hypervGetWin32ProcessorList(hypervPrivate *priv, virBufferPtr query, Win32_Processor **list) { return hypervGetWmiClassList(priv, Win32_Processor_WmiInfo, query, - (hypervObject **) list); + (hypervObject **)list); } int @@ -1287,7 +1287,7 @@ hypervGetMsvmVirtualSystemSettingDataList(hypervPrivate *priv, Msvm_VirtualSystemSettingData **list) { return hypervGetWmiClassList(priv, Msvm_VirtualSystemSettingData_WmiInfo, query, - (hypervObject **) list); + (hypervObject **)list); } int @@ -1296,7 +1296,7 @@ hypervGetMsvmProcessorSettingDataList(hypervPrivate *priv, Msvm_ProcessorSettingData **list) { return hypervGetWmiClassList(priv, Msvm_ProcessorSettingData_WmiInfo, query, - (hypervObject **) list); + (hypervObject **)list); } int @@ -1304,14 +1304,14 @@ hypervGetMsvmMemorySettingDataList(hypervPrivate *priv, virBufferPtr query, Msvm_MemorySettingData **list) { return hypervGetWmiClassList(priv, Msvm_MemorySettingData_WmiInfo, query, - (hypervObject **) list); + (hypervObject **)list); } int hypervGetMsvmKeyboardList(hypervPrivate *priv, virBufferPtr query, Msvm_Keyboard **list) { return hypervGetWmiClassList(priv, Msvm_Keyboard_WmiInfo, query, - (hypervObject **) list); + (hypervObject **)list); } @@ -1621,7 +1621,7 @@ hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv, uuid_string); if (hypervGetWmiClassList(priv, Msvm_VirtualSystemSettingData_WmiInfo, &query, - (hypervObject **) list) < 0 || *list == NULL) + (hypervObject **)list) < 0 || *list == NULL) return -1; return 0; @@ -1646,7 +1646,7 @@ hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv, vssd_instanceid); if (hypervGetWmiClassList(priv, Msvm_MemorySettingData_WmiInfo, &query, - (hypervObject **) list) < 0 || *list == NULL) + (hypervObject **)list) < 0 || *list == NULL) return -1; return 0; -- 2.17.0
On Wed, Apr 25, 2018 at 03:24:44PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/hyperv/hyperv_driver.c | 8 ++++---- src/hyperv/hyperv_wmi.c | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/libxl/libxl_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 452a77f3b8c4..571869928388 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -294,7 +294,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, for (i = 0; i < virDomainDefGetVcpus(def); i++) libxl_bitmap_set((&b_info->avail_vcpus), i); - switch ((virDomainClockOffsetType) clock.offset) { + switch ((virDomainClockOffsetType)clock.offset) { case VIR_DOMAIN_CLOCK_OFFSET_VARIABLE: if (clock.data.variable.basis == VIR_DOMAIN_CLOCK_BASIS_LOCALTIME) libxl_defbool_set(&b_info->localtime, true); @@ -323,7 +323,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, } for (i = 0; i < clock.ntimers; i++) { - switch ((virDomainTimerNameType) clock.timers[i]->name) { + switch ((virDomainTimerNameType)clock.timers[i]->name) { case VIR_DOMAIN_TIMER_NAME_TSC: switch (clock.timers[i]->mode) { case VIR_DOMAIN_TIMER_MODE_NATIVE: -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/locking/lock_driver_sanlock.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 345cf0a77257..9c01f59349fd 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -258,7 +258,7 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriverPtr driver) goto error; } - if (driver->group != (gid_t) -1) + if (driver->group != (gid_t)-1) perms |= 0060; if ((fd = open(path, O_WRONLY|O_CREAT|O_EXCL, perms)) < 0) { @@ -271,13 +271,13 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriverPtr driver) VIR_DEBUG("Someone else just created lockspace %s", path); } else { /* chown() the path to make sure sanlock can access it */ - if ((driver->user != (uid_t) -1 || driver->group != (gid_t) -1) && + if ((driver->user != (uid_t)-1 || driver->group != (gid_t)-1) && (fchown(fd, driver->user, driver->group) < 0)) { virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), path, - (unsigned int) driver->user, - (unsigned int) driver->group); + (unsigned int)driver->user, + (unsigned int)driver->group); goto error_unlink; } @@ -331,18 +331,18 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriverPtr driver) } } else if (S_ISREG(st.st_mode)) { /* okay, the lease file exists. Check the permissions */ - if (((driver->user != (uid_t) -1 && driver->user != st.st_uid) || - (driver->group != (gid_t) -1 && driver->group != st.st_gid)) && + if (((driver->user != (uid_t)-1 && driver->user != st.st_uid) || + (driver->group != (gid_t)-1 && driver->group != st.st_gid)) && (chown(path, driver->user, driver->group) < 0)) { virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), path, - (unsigned int) driver->user, - (unsigned int) driver->group); + (unsigned int)driver->user, + (unsigned int)driver->group); goto error; } - if ((driver->group != (gid_t) -1 && (st.st_mode & 0060) != 0060) && + if ((driver->group != (gid_t)-1 && (st.st_mode & 0060) != 0060) && chmod(path, 0660) < 0) { virReportSystemError(errno, _("cannot chmod '%s' to 0660"), @@ -443,8 +443,8 @@ static int virLockManagerSanlockInit(unsigned int version, driver->hostID = 0; driver->autoDiskLease = false; driver->io_timeout = 0; - driver->user = (uid_t) -1; - driver->group = (gid_t) -1; + driver->user = (uid_t)-1; + driver->group = (gid_t)-1; if (VIR_STRDUP(driver->autoDiskLeasePath, LOCALSTATEDIR "/lib/libvirt/sanlock") < 0) { VIR_FREE(driver); goto error; @@ -711,13 +711,13 @@ virLockManagerSanlockCreateLease(virLockManagerSanlockDriverPtr driver, VIR_DEBUG("Someone else just created lockspace %s", res->disks[0].path); } else { /* chown() the path to make sure sanlock can access it */ - if ((driver->user != (uid_t) -1 || driver->group != (gid_t) -1) && + if ((driver->user != (uid_t)-1 || driver->group != (gid_t)-1) && (fchown(fd, driver->user, driver->group) < 0)) { virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), res->disks[0].path, - (unsigned int) driver->user, - (unsigned int) driver->group); + (unsigned int)driver->user, + (unsigned int)driver->group); goto error_unlink; } -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_controller.c | 4 ++-- src/lxc/lxc_domain.c | 4 ++-- src/lxc/lxc_driver.c | 4 ++-- src/lxc/lxc_monitor.c | 2 +- src/lxc/lxc_native.c | 4 ++-- src/lxc/lxc_process.c | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 336980187035..8e937ec38985 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -204,7 +204,7 @@ static int virLXCCgroupGetMemUsage(virCgroupPtr cgroup, unsigned long memUsage; ret = virCgroupGetMemoryUsage(cgroup, &memUsage); - meminfo->memusage = (unsigned long long) memUsage; + meminfo->memusage = (unsigned long long)memUsage; return ret; } diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 507bffda09ba..d5636b808c79 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1028,7 +1028,7 @@ static void virLXCControllerSignalChildIO(virNetDaemonPtr dmn, int status; ret = waitpid(-1, &status, WNOHANG); - VIR_DEBUG("Got sig child %d vs %lld", ret, (long long) ctrl->initpid); + VIR_DEBUG("Got sig child %d vs %lld", ret, (long long)ctrl->initpid); if (ret == ctrl->initpid) { virNetDaemonQuit(dmn); virMutexLock(&lock); @@ -2307,7 +2307,7 @@ virLXCControllerEventSendInit(virLXCControllerPtr ctrl, { virLXCMonitorInitEventMsg msg; - VIR_DEBUG("Init pid %lld", (long long) initpid); + VIR_DEBUG("Init pid %lld", (long long)initpid); memset(&msg, 0, sizeof(msg)); msg.initpid = initpid; diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index d23969a585f4..b197f9dfc280 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -234,7 +234,7 @@ lxcDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED, for (i = 0; i < n; i++) { if ((feature = virLXCDomainNamespaceTypeFromString( - (const char *) nodes[i]->name)) < 0) { + (const char *)nodes[i]->name)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported Namespace feature: %s"), nodes[i]->name); @@ -330,7 +330,7 @@ virLXCDomainObjPrivateXMLFormat(virBufferPtr buf, virLXCDomainObjPrivatePtr priv = vm->privateData; virBufferAsprintf(buf, "<init pid='%lld'/>\n", - (long long) priv->initpid); + (long long)priv->initpid); return 0; } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ca01d369d581..dd4e28fc7f70 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3427,7 +3427,7 @@ lxcDomainShutdownFlags(virDomainPtr dom, errno != ESRCH) { virReportSystemError(errno, _("Unable to send SIGTERM to init pid %llu"), - (long long) priv->initpid); + (long long)priv->initpid); goto endjob; } } @@ -3510,7 +3510,7 @@ lxcDomainReboot(virDomainPtr dom, errno != ESRCH) { virReportSystemError(errno, _("Unable to send SIGTERM to init pid %llu"), - (long long) priv->initpid); + (long long)priv->initpid); goto endjob; } } diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index a569e4184909..e765c167117f 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -102,7 +102,7 @@ virLXCMonitorHandleEventInit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, virLXCMonitorPtr mon = opaque; virLXCMonitorInitEventMsg *msg = evdata; - VIR_DEBUG("Event init %lld", (long long) msg->initpid); + VIR_DEBUG("Event init %lld", (long long)msg->initpid); if (mon->cb.initNotify) mon->cb.initNotify(mon, (pid_t)msg->initpid, mon->vm); } diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index fdc03a57eaaf..55ea7748f4f8 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -299,7 +299,7 @@ lxcAddFstabLine(virDomainDefPtr def, lxcFstabPtr fstab) type = VIR_DOMAIN_FS_TYPE_BLOCK; /* Do we have ro in options? */ - readonly = virStringListHasString((const char **) options, "ro"); + readonly = virStringListHasString((const char **)options, "ro"); if (lxcAddFSDef(def, type, src, dst, readonly, usage) < 0) goto cleanup; @@ -982,7 +982,7 @@ lxcSetCapDrop(virDomainDefPtr def, virConfPtr properties) for (i = 0; i < VIR_DOMAIN_CAPS_FEATURE_LAST; i++) { capString = virDomainCapsFeatureTypeToString(i); if (toDrop != NULL && - virStringListHasString((const char **) toDrop, capString)) + virStringListHasString((const char **)toDrop, capString)) def->caps_features[i] = VIR_TRISTATE_SWITCH_OFF; } diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index e911d88b5636..0579fef83633 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -737,7 +737,7 @@ virLXCProcessGetNsInode(pid_t pid, int ret = -1; if (virAsprintf(&path, "/proc/%lld/ns/%s", - (long long) pid, nsname) < 0) + (long long)pid, nsname) < 0) goto cleanup; if (stat(path, &sb) < 0) { @@ -773,7 +773,7 @@ static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED if (virLXCProcessGetNsInode(initpid, "pid", &inode) < 0) { VIR_WARN("Cannot obtain pid NS inode for %lld: %s", - (long long) initpid, + (long long)initpid, virGetLastErrorMessage()); virResetLastError(); } -- 2.17.0
On Wed, Apr 25, 2018 at 03:24:47PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_controller.c | 4 ++-- src/lxc/lxc_domain.c | 4 ++-- src/lxc/lxc_driver.c | 4 ++-- src/lxc/lxc_monitor.c | 2 +- src/lxc/lxc_native.c | 4 ++-- src/lxc/lxc_process.c | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/network/bridge_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 2e9191f75d53..ece7e41d35a7 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3348,7 +3348,7 @@ networkValidate(virNetworkDriverStatePtr driver, virNetworkForwardIfDefPtr iface = &def->forward.ifs[i]; char *sysfs_path = NULL; - switch ((virNetworkForwardHostdevDeviceType) iface->type) { + switch ((virNetworkForwardHostdevDeviceType)iface->type) { case VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV: usesInterface = true; @@ -4186,7 +4186,7 @@ networkGetDHCPLeases(virNetworkPtr net, } } - currtime = (long long) time(NULL); + currtime = (long long)time(NULL); for (i = 0; i < size; i++) { if (!(lease_tmp = virJSONValueArrayGet(leases_array, i))) { -- 2.17.0
On Wed, Apr 25, 2018 at 03:24:48PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/network/bridge_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/nwfilter/nwfilter_dhcpsnoop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 6069e7046075..659277d47a45 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -987,7 +987,7 @@ virNWFilterSnoopDHCPDecode(virNWFilterSnoopReqPtr req, switch (ntohs(pep->eh_type)) { case ETHERTYPE_IP: VIR_WARNINGS_NO_CAST_ALIGN - pip = (struct iphdr *) pep->eh_data; + pip = (struct iphdr *)pep->eh_data; VIR_WARNINGS_RESET len -= offsetof(virNWFilterSnoopEthHdr, eh_data); break; @@ -999,13 +999,13 @@ virNWFilterSnoopDHCPDecode(virNWFilterSnoopReqPtr req, return -2; VIR_WARNINGS_NO_CAST_ALIGN - pup = (struct udphdr *) ((char *) pip + (pip->ihl << 2)); + pup = (struct udphdr *)((char *)pip + (pip->ihl << 2)); VIR_WARNINGS_RESET len -= pip->ihl << 2; if (len < 0) return -2; - pd = (virNWFilterSnoopDHCPHdrPtr) ((char *) pup + sizeof(*pup)); + pd = (virNWFilterSnoopDHCPHdrPtr) ((char *)pup + sizeof(*pup)); len -= sizeof(*pup); if (len < 0) return -2; /* invalid packet length */ -- 2.17.0
On Wed, Apr 25, 2018 at 03:24:49PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/nwfilter/nwfilter_dhcpsnoop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/phyp/phyp_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index ed3d9feb5810..67ce7903baaf 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -530,7 +530,7 @@ phypUUIDTable_Push(virConnectPtr conn) channel = libssh2_scp_send(session, remote_file, 0x1FF & local_fileinfo.st_mode, - (unsigned long) local_fileinfo.st_size); + (unsigned long)local_fileinfo.st_size); if ((!channel) && (libssh2_session_last_errno(session) != LIBSSH2_ERROR_EAGAIN)) -- 2.17.0
On Wed, Apr 25, 2018 at 03:24:50PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/phyp/phyp_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/qemu/qemu_agent.c | 4 +- src/qemu/qemu_alias.c | 2 +- src/qemu/qemu_block.c | 2 +- src/qemu/qemu_capabilities.c | 20 +++++----- src/qemu/qemu_command.c | 18 ++++----- src/qemu/qemu_domain.c | 32 ++++++++-------- src/qemu/qemu_domain_address.c | 12 +++--- src/qemu/qemu_driver.c | 68 +++++++++++++++++----------------- src/qemu/qemu_hostdev.c | 2 +- src/qemu/qemu_hotplug.c | 8 ++-- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor_json.c | 4 +- src/qemu/qemu_parse_command.c | 6 +-- src/qemu/qemu_process.c | 10 ++--- 15 files changed, 96 insertions(+), 96 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 488a19d4a6d4..4df1bde458e5 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -220,7 +220,7 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress) if (virTimeBackOffStart(&timeout, 1, 3*1000 /* ms */) < 0) goto error; while (virTimeBackOffWait(&timeout)) { - ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr)); + ret = connect(monfd, (struct sockaddr *)&addr, sizeof(addr)); if (ret == 0) break; @@ -2225,7 +2225,7 @@ qemuAgentSetUserPassword(qemuAgentPtr mon, virJSONValuePtr reply = NULL; char *password64 = NULL; - if (!(password64 = virStringEncodeBase64((unsigned char *) password, + if (!(password64 = virStringEncodeBase64((unsigned char *)password, strlen(password)))) goto cleanup; diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 95d1e0370a63..9b49f9c1e163 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -92,7 +92,7 @@ qemuAssignDeviceChrAlias(virDomainDefPtr def, if (chr->info.alias) return 0; - switch ((virDomainChrDeviceType) chr->deviceType) { + switch ((virDomainChrDeviceType)chr->deviceType) { case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL: prefix = "parallel"; break; diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index c0cf6a95ad8b..e648fb9625f1 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -987,7 +987,7 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourcePtr src) int actualType = virStorageSourceGetActualType(src); virJSONValuePtr fileprops = NULL; - switch ((virStorageType) actualType) { + switch ((virStorageType)actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: case VIR_STORAGE_TYPE_DIR: diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 833c75514c25..312984bac61e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2359,7 +2359,7 @@ virQEMUCapsProbeQMPTPM(virQEMUCapsPtr qemuCaps, for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsTPMModelsToCaps); i++) { const char *needle = virDomainTPMModelTypeToString( virQEMUCapsTPMModelsToCaps[i].type); - if (virStringListHasString((const char **) entries, needle)) + if (virStringListHasString((const char **)entries, needle)) virQEMUCapsSet(qemuCaps, virQEMUCapsTPMModelsToCaps[i].caps); } @@ -2373,7 +2373,7 @@ virQEMUCapsProbeQMPTPM(virQEMUCapsPtr qemuCaps, for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsTPMTypesToCaps); i++) { const char *needle = virDomainTPMBackendTypeToString( virQEMUCapsTPMTypesToCaps[i].type); - if (virStringListHasString((const char **) entries, needle)) + if (virStringListHasString((const char **)entries, needle)) virQEMUCapsSet(qemuCaps, virQEMUCapsTPMTypesToCaps[i].caps); } } @@ -3449,11 +3449,11 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps) virBufferAdjustIndent(&buf, 2); virBufferAsprintf(&buf, "<qemuctime>%llu</qemuctime>\n", - (long long) qemuCaps->ctime); + (long long)qemuCaps->ctime); virBufferAsprintf(&buf, "<selfctime>%llu</selfctime>\n", - (long long) qemuCaps->libvirtCtime); + (long long)qemuCaps->libvirtCtime); virBufferAsprintf(&buf, "<selfvers>%lu</selfvers>\n", - (unsigned long) qemuCaps->libvirtVersion); + (unsigned long)qemuCaps->libvirtVersion); if (qemuCaps->usedQMP) virBufferAddLit(&buf, "<usedQMP/>\n"); @@ -3595,7 +3595,7 @@ virQEMUCapsIsValid(void *data, VIR_DEBUG("Outdated capabilities for '%s': QEMU binary changed " "(%lld vs %lld)", qemuCaps->binary, - (long long) sb.st_ctime, (long long) qemuCaps->ctime); + (long long)sb.st_ctime, (long long)qemuCaps->ctime); return false; } @@ -3970,10 +3970,10 @@ virQEMUCapsInitQMPCommandAbort(virQEMUCapsInitQMPCommandPtr cmd) if (cmd->pid != 0) { char ebuf[1024]; - VIR_DEBUG("Killing QMP caps process %lld", (long long) cmd->pid); + VIR_DEBUG("Killing QMP caps process %lld", (long long)cmd->pid); if (virProcessKill(cmd->pid, SIGKILL) < 0 && errno != ESRCH) VIR_ERROR(_("Failed to kill process %lld: %s"), - (long long) cmd->pid, + (long long)cmd->pid, virStrerror(errno, ebuf, sizeof(ebuf))); VIR_FREE(*cmd->qmperr); @@ -4451,7 +4451,7 @@ virQEMUCapsCompareArch(const void *payload, const void *name ATTRIBUTE_UNUSED, const void *opaque) { - struct virQEMUCapsSearchData *data = (struct virQEMUCapsSearchData *) opaque; + struct virQEMUCapsSearchData *data = (struct virQEMUCapsSearchData *)opaque; const virQEMUCaps *qemuCaps = payload; return qemuCaps->arch == data->arch; @@ -4621,7 +4621,7 @@ virQEMUCapsFillDomainCPUCaps(virCapsPtr caps, cpus = qemuCaps->tcgCPUModels; filtered = virDomainCapsCPUModelsFilter(cpus, - (const char **) models, + (const char **)models, blacklist); virStringListFree(models); } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 418729b9881e..79beec48dadd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1035,7 +1035,7 @@ qemuGetDriveSourceString(virStorageSourcePtr src, if (virStorageSourceIsEmpty(src)) return 1; - switch ((virStorageType) actualType) { + switch ((virStorageType)actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: case VIR_STORAGE_TYPE_DIR: @@ -2618,7 +2618,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, *devstr = NULL; - switch ((virDomainControllerType) def->type) { + switch ((virDomainControllerType)def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: switch ((virDomainControllerModelSCSI) def->model) { case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI: @@ -3923,7 +3923,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, goto error; } - switch ((virDomainInputType) dev->type) { + switch ((virDomainInputType)dev->type) { case VIR_DOMAIN_INPUT_TYPE_MOUSE: if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_MOUSE) || (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && @@ -4489,7 +4489,7 @@ qemuBuildPCIHostdevDevStr(const virDomainDef *def, int backend = pcisrc->backend; /* caller has to assign proper passthrough backend type */ - switch ((virDomainHostdevSubsysPCIBackendType) backend) { + switch ((virDomainHostdevSubsysPCIBackendType)backend) { case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM: virBufferAddLit(&buf, "pci-assign"); if (configfd && *configfd) @@ -6116,7 +6116,7 @@ qemuBuildClockCommandLine(virCommandPtr cmd, } for (i = 0; i < def->clock.ntimers; i++) { - switch ((virDomainTimerNameType) def->clock.timers[i]->name) { + switch ((virDomainTimerNameType)def->clock.timers[i]->name) { case VIR_DOMAIN_TIMER_NAME_PLATFORM: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported timer type (name) '%s'"), @@ -8051,7 +8051,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, goto error; } - switch ((virDomainChrType) net->data.vhostuser->type) { + switch ((virDomainChrType)net->data.vhostuser->type) { case VIR_DOMAIN_CHR_TYPE_UNIX: if (!(chardev = qemuBuildChrChardevStr(logManager, cmd, cfg, def, net->data.vhostuser, @@ -10126,7 +10126,7 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, char *addr = NULL; int port; - switch ((virDomainChrChannelTargetType) chr->targetType) { + switch ((virDomainChrChannelTargetType)chr->targetType) { case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: addr = virSocketAddrFormat(chr->target.addr); @@ -10164,7 +10164,7 @@ qemuBuildConsoleChrDeviceStr(char **deviceStr, { int ret = -1; - switch ((virDomainChrConsoleTargetType) chr->targetType) { + switch ((virDomainChrConsoleTargetType)chr->targetType) { case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLPLM: if (!(*deviceStr = qemuBuildSclpDevStr(chr))) @@ -10204,7 +10204,7 @@ qemuBuildChrDeviceStr(char **deviceStr, { int ret = -1; - switch ((virDomainChrDeviceType) chr->deviceType) { + switch ((virDomainChrDeviceType)chr->deviceType) { case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL: ret = qemuBuildSerialChrDeviceStr(deviceStr, vmdef, chr, qemuCaps); break; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 326c939c85c0..f46b0ad89761 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2465,7 +2465,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, xmlNodePtr next; for (next = node->children; next; next = next->next) { - int ns = qemuDomainNamespaceTypeFromString((const char *) next->name); + int ns = qemuDomainNamespaceTypeFromString((const char *)next->name); if (ns < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3657,7 +3657,7 @@ qemuDomainChrSourceDefValidate(const virDomainChrSourceDef *def) static int qemuDomainChrSerialTargetTypeToAddressType(int targetType) { - switch ((virDomainChrSerialTargetType) targetType) { + switch ((virDomainChrSerialTargetType)targetType) { case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA: return VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA; case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB: @@ -3708,11 +3708,11 @@ qemuDomainChrTargetDefValidate(const virDomainChrDef *chr) { int expected; - switch ((virDomainChrDeviceType) chr->deviceType) { + switch ((virDomainChrDeviceType)chr->deviceType) { case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL: /* Validate target type */ - switch ((virDomainChrSerialTargetType) chr->targetType) { + switch ((virDomainChrSerialTargetType)chr->targetType) { case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI: @@ -4926,7 +4926,7 @@ qemuDomainDeviceDefValidateController(const virDomainControllerDef *controller, if (qemuDomainDeviceDefValidateControllerAttributes(controller) < 0) return -1; - switch ((virDomainControllerType) controller->type) { + switch ((virDomainControllerType)controller->type) { case VIR_DOMAIN_CONTROLLER_TYPE_IDE: ret = qemuDomainDeviceDefValidateControllerIDE(controller, def); break; @@ -4994,7 +4994,7 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, def->emulator))) return -1; - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_NET: ret = qemuDomainDeviceDefValidateNetwork(dev->data.net); break; @@ -5337,7 +5337,7 @@ qemuDomainControllerDefPostParse(virDomainControllerDefPtr cont, */ if (cont->opts.pciopts.numaNode >= 0 && cont->opts.pciopts.numaNode >= - (int) virDomainNumaGetNodeCount(def->numa)) { + (int)virDomainNumaGetNodeCount(def->numa)) { virReportError(VIR_ERR_XML_ERROR, _("%s with index %d is " "configured for a NUMA node (%d) " @@ -5393,7 +5393,7 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr, /* Set the default target model */ if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && chr->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE) { - switch ((virDomainChrSerialTargetType) chr->targetType) { + switch ((virDomainChrSerialTargetType)chr->targetType) { case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA: chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL; break; @@ -6334,7 +6334,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver, * towards older libvirt versions works for such guests, we switch * it back to the default here */ if (flags & VIR_DOMAIN_XML_MIGRATABLE) { - switch ((virDomainChrSerialTargetType) serial->targetType) { + switch ((virDomainChrSerialTargetType)serial->targetType) { case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM: serial->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE; @@ -9575,7 +9575,7 @@ qemuDomainGetHostdevPath(virDomainDefPtr def, switch ((virDomainHostdevMode) dev->mode) { case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: - switch ((virDomainHostdevSubsysType) dev->source.subsys.type) { + switch ((virDomainHostdevSubsysType)dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: if (pcisrc->backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { pci = virPCIDeviceNew(pcisrc->addr.domain, @@ -9617,7 +9617,7 @@ qemuDomainGetHostdevPath(virDomainDefPtr def, if (!usb) goto cleanup; - if (!(tmpPath = (char *) virUSBDeviceGetPath(usb))) + if (!(tmpPath = (char *)virUSBDeviceGetPath(usb))) goto cleanup; perm = VIR_CGROUP_DEVICE_RW; break; @@ -9642,7 +9642,7 @@ qemuDomainGetHostdevPath(virDomainDefPtr def, if (!scsi) goto cleanup; - if (!(tmpPath = (char *) virSCSIDeviceGetPath(scsi))) + if (!(tmpPath = (char *)virSCSIDeviceGetPath(scsi))) goto cleanup; perm = virSCSIDeviceGetReadonly(scsi) ? VIR_CGROUP_DEVICE_READ : VIR_CGROUP_DEVICE_RW; @@ -9655,7 +9655,7 @@ qemuDomainGetHostdevPath(virDomainDefPtr def, if (!(host = virSCSIVHostDeviceNew(hostsrc->wwpn))) goto cleanup; - if (!(tmpPath = (char *) virSCSIVHostDeviceGetPath(host))) + if (!(tmpPath = (char *)virSCSIVHostDeviceGetPath(host))) goto cleanup; perm = VIR_CGROUP_DEVICE_RW; } @@ -10077,7 +10077,7 @@ qemuDomainCreateDeviceRecursive(const char *device, } if (tcon && - lsetfilecon_raw(devicePath, (VIR_SELINUX_CTX_CONST char *) tcon) < 0) { + lsetfilecon_raw(devicePath, (VIR_SELINUX_CTX_CONST char *)tcon) < 0) { VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR if (errno != EOPNOTSUPP && errno != ENOTSUP) { VIR_WARNINGS_RESET @@ -10332,7 +10332,7 @@ qemuDomainSetupAllChardevs(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, if (virDomainChrDefForeach(vm->def, true, qemuDomainSetupChardev, - (void *) data) < 0) + (void *)data) < 0) return -1; VIR_DEBUG("Setup all chardevs"); @@ -10848,7 +10848,7 @@ qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, # ifdef WITH_SELINUX if (data->tcon && - lsetfilecon_raw(data->file, (VIR_SELINUX_CTX_CONST char *) data->tcon) < 0) { + lsetfilecon_raw(data->file, (VIR_SELINUX_CTX_CONST char *)data->tcon) < 0) { VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR if (errno != EOPNOTSUPP && errno != ENOTSUP) { VIR_WARNINGS_RESET diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 7fe9d5926c9f..ce2b0790c040 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -427,7 +427,7 @@ qemuDomainHasVirtioMMIODevicesCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) { /* We can stop iterating as soon as we find the first * virtio-mmio device */ - *((bool *) opaque) = true; + *((bool *)opaque) = true; return -1; } @@ -508,11 +508,11 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, virDomainPCIConnectFlags pciFlags = (VIR_PCI_CONNECT_TYPE_PCI_DEVICE | VIR_PCI_CONNECT_HOTPLUGGABLE); - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_CONTROLLER: { virDomainControllerDefPtr cont = dev->data.controller; - switch ((virDomainControllerType) cont->type) { + switch ((virDomainControllerType)cont->type) { case VIR_DOMAIN_CONTROLLER_TYPE_PCI: return virDomainPCIControllerModelToConnectType(cont->model); @@ -786,7 +786,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, break; case VIR_DOMAIN_DEVICE_VIDEO: - switch ((virDomainVideoType) dev->data.video->type) { + switch ((virDomainVideoType)dev->data.video->type) { case VIR_DOMAIN_VIDEO_TYPE_VIRTIO: return virtioFlags; @@ -824,7 +824,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, break; case VIR_DOMAIN_DEVICE_CHR: - switch ((virDomainChrSerialTargetType) dev->data.chr->targetType) { + switch ((virDomainChrSerialTargetType)dev->data.chr->targetType) { case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI: return pciFlags; @@ -2346,7 +2346,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, virDomainControllerDefPtr cont = def->controllers[i]; if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) { - if ((int) cont->idx > max_idx) + if ((int)cont->idx > max_idx) max_idx = cont->idx; } } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7484b00e23c3..016669ba81a9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -765,36 +765,36 @@ qemuStateInitialize(bool privileged, if (chown(cfg->libDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to user %d:%d"), - cfg->libDir, (int) cfg->user, - (int) cfg->group); + cfg->libDir, (int)cfg->user, + (int)cfg->group); goto error; } if (chown(cfg->cacheDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:%d"), - cfg->cacheDir, (int) cfg->user, - (int) cfg->group); + cfg->cacheDir, (int)cfg->user, + (int)cfg->group); goto error; } if (chown(cfg->saveDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:%d"), - cfg->saveDir, (int) cfg->user, - (int) cfg->group); + cfg->saveDir, (int)cfg->user, + (int)cfg->group); goto error; } if (chown(cfg->snapshotDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:%d"), - cfg->snapshotDir, (int) cfg->user, - (int) cfg->group); + cfg->snapshotDir, (int)cfg->user, + (int)cfg->group); goto error; } if (chown(cfg->autoDumpPath, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:%d"), - cfg->autoDumpPath, (int) cfg->user, - (int) cfg->group); + cfg->autoDumpPath, (int)cfg->user, + (int)cfg->group); goto error; } if (!(channeldir = mdir_name(cfg->channelTargetDir))) { @@ -804,8 +804,8 @@ qemuStateInitialize(bool privileged, if (chown(channeldir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:%d"), - channeldir, (int) cfg->user, - (int) cfg->group); + channeldir, (int)cfg->user, + (int)cfg->group); VIR_FREE(channeldir); goto error; } @@ -813,22 +813,22 @@ qemuStateInitialize(bool privileged, if (chown(cfg->channelTargetDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:%d"), - cfg->channelTargetDir, (int) cfg->user, - (int) cfg->group); + cfg->channelTargetDir, (int)cfg->user, + (int)cfg->group); goto error; } if (chown(cfg->nvramDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:%d"), - cfg->nvramDir, (int) cfg->user, - (int) cfg->group); + cfg->nvramDir, (int)cfg->user, + (int)cfg->group); goto error; } if (chown(cfg->memoryBackingDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:%d"), - cfg->memoryBackingDir, (int) cfg->user, - (int) cfg->group); + cfg->memoryBackingDir, (int)cfg->user, + (int)cfg->group); goto error; } @@ -1405,9 +1405,9 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, /* In general, we cannot assume pid_t fits in int; but /proc parsing * is specific to Linux where int works fine. */ if (tid) - ret = virAsprintf(&proc, "/proc/%d/task/%d/stat", (int) pid, tid); + ret = virAsprintf(&proc, "/proc/%d/task/%d/stat", (int)pid, tid); else - ret = virAsprintf(&proc, "/proc/%d/stat", (int) pid); + ret = virAsprintf(&proc, "/proc/%d/stat", (int)pid); if (ret < 0) return -1; @@ -1444,7 +1444,7 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, VIR_DEBUG("Got status for %d/%d user=%llu sys=%llu cpu=%d rss=%ld", - (int) pid, tid, usertime, systime, cpu, rss); + (int)pid, tid, usertime, systime, cpu, rss); VIR_FORCE_FCLOSE(pidinfo); @@ -6558,7 +6558,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, virQEMUSaveHeaderPtr header = &data->header; qemuDomainSaveCookiePtr cookie = NULL; - if (virSaveCookieParseString(data->cookie, (virObjectPtr *) &cookie, + if (virSaveCookieParseString(data->cookie, (virObjectPtr *)&cookie, virDomainXMLOptionGetSaveCookie(driver->xmlopt)) < 0) goto cleanup; @@ -7599,7 +7599,7 @@ qemuDomainAttachDeviceLive(virDomainObjPtr vm, int ret = -1; const char *alias = NULL; - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: qemuDomainObjCheckDiskTaint(driver, vm, dev->data.disk, NULL); ret = qemuDomainAttachDeviceDiskLive(driver, vm, dev); @@ -7765,7 +7765,7 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, { int ret = -1; - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: ret = qemuDomainDetachDeviceDiskLive(driver, vm, dev); break; @@ -7904,7 +7904,7 @@ qemuDomainUpdateDeviceLive(virDomainObjPtr vm, int ret = -1; int idx; - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: qemuDomainObjCheckDiskTaint(driver, vm, dev->data.disk, NULL); ret = qemuDomainChangeDiskLive(vm, dev, driver, force); @@ -7977,7 +7977,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainRedirdevDefPtr redirdev; virDomainShmemDefPtr shmem; - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: disk = dev->data.disk; if (virDomainDiskIndexByName(vmdef, disk->dst, true) >= 0) { @@ -8168,7 +8168,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainMemoryDefPtr mem; int idx; - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: disk = dev->data.disk; if (!(det_disk = virDomainDiskRemoveByName(vmdef, disk->dst))) { @@ -8346,7 +8346,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDef oldDev = { .type = dev->type }; int pos; - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: newDisk = dev->data.disk; if ((pos = virDomainDiskIndexByName(vmdef, newDisk->dst, false)) < 0) { @@ -11671,7 +11671,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, goto endjob; /* Read the memory file into buffer. */ - if (saferead(fd, buffer, size) == (ssize_t) -1) { + if (saferead(fd, buffer, size) == (ssize_t)-1) { virReportSystemError(errno, _("failed to read temporary file " "created with template %s"), tmp); @@ -14114,7 +14114,7 @@ qemuDomainSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDefPtr snapdi int domDiskType = virStorageSourceGetActualType(domdisk->src); int snapDiskType = virStorageSourceGetActualType(snapdisk->src); - switch ((virStorageType) domDiskType) { + switch ((virStorageType)domDiskType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: break; @@ -14153,7 +14153,7 @@ qemuDomainSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDefPtr snapdi return -1; } - switch ((virStorageType) snapDiskType) { + switch ((virStorageType)snapDiskType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: break; @@ -14189,7 +14189,7 @@ qemuDomainSnapshotPrepareDiskExternalActive(virDomainSnapshotDiskDefPtr snapdisk return -1; } - switch ((virStorageType) actualType) { + switch ((virStorageType)actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: break; @@ -14307,7 +14307,7 @@ qemuDomainSnapshotPrepareDiskInternal(virDomainDiskDefPtr disk, actualType = virStorageSourceGetActualType(disk->src); - switch ((virStorageType) actualType) { + switch ((virStorageType)actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: return 0; @@ -17497,7 +17497,7 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *disk, const char *destxml, * overflow detection if this is a 32-bit server handling a * 64-bit client. */ if (STREQ(param->field, VIR_DOMAIN_BLOCK_COPY_BANDWIDTH)) { - if (sizeof(unsigned long) < sizeof(bandwidth) && + if (sizeof(unsigned long)< sizeof(bandwidth) && param->value.ul > ULONG_MAX * (1ULL << 20)) { virReportError(VIR_ERR_OVERFLOW, _("bandwidth must be less than %llu bytes"), diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index afe445d4e737..d2b546043d24 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -205,7 +205,7 @@ qemuHostdevPreparePCIDevicesCheckSupport(virDomainHostdevDefPtr *hostdevs, if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) continue; - switch ((virDomainHostdevSubsysPCIBackendType) *backend) { + switch ((virDomainHostdevSubsysPCIBackendType)*backend) { case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT: if (supportsPassthroughVFIO && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) { diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index df9e8aa71679..282916d3fc02 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1207,7 +1207,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, /* this could have been changed by qemuHostdevPreparePCIDevices */ backend = hostdev->source.subsys.u.pci.backend; - switch ((virDomainHostdevSubsysPCIBackendType) backend) { + switch ((virDomainHostdevSubsysPCIBackendType)backend) { case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO: if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -4060,7 +4060,7 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, if (qemuDomainNamespaceTeardownHostdev(vm, hostdev) < 0) VIR_WARN("Unable to remove host device from /dev"); - switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) { + switch ((virDomainHostdevSubsysType)hostdev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: qemuDomainRemovePCIHostDevice(driver, vm, hostdev); /* QEMU might no longer need to lock as much memory, eg. we just @@ -4474,7 +4474,7 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, virDomainDeviceDefPtr dev) { int ret = -1; - switch ((virDomainDeviceType) dev->type) { + switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: ret = qemuDomainRemoveDiskDevice(driver, vm, dev->data.disk); break; @@ -5411,7 +5411,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, (auth->expires && auth->validTo <= now)) { expire = "now"; } else if (auth->expires) { - if (virAsprintf(&validTo, "%lu", (unsigned long) auth->validTo) < 0) + if (virAsprintf(&validTo, "%lu", (unsigned long)auth->validTo) < 0) goto end_job; expire = validTo; } else { diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 88b8253fa996..6a93b771aace 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -180,7 +180,7 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, VIR_DEBUG("Precreate disk type=%s", virStorageTypeToString(disk->src->type)); - switch ((virStorageType) disk->src->type) { + switch ((virStorageType)disk->src->type) { case VIR_STORAGE_TYPE_FILE: if (!virDomainDiskGetSource(disk)) { VIR_DEBUG("Dropping sourceless disk '%s'", diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index f642d9a51ab6..8c3e881b29c2 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -365,7 +365,7 @@ qemuMonitorOpenUnix(const char *monitor, if (virTimeBackOffStart(&timebackoff, 1, timeout * 1000) < 0) goto error; while (virTimeBackOffWait(&timebackoff)) { - ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr)); + ret = connect(monfd, (struct sockaddr *)&addr, sizeof(addr)); if (ret == 0) break; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 24d37eb41dc1..180f4b2a3a40 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5325,7 +5325,7 @@ qemuMonitorJSONParseCPUModelProperty(const char *key, prop = machine_model->props + machine_model->nprops; - switch ((virJSONType) virJSONValueGetType(value)) { + switch ((virJSONType)virJSONValueGetType(value)) { case VIR_JSON_TYPE_STRING: if (VIR_STRDUP(prop->value.string, virJSONValueGetString(value)) < 0) return -1; @@ -6587,7 +6587,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, goto cleanup; } - switch ((virDomainChrType) chr->type) { + switch ((virDomainChrType)chr->type) { case VIR_DOMAIN_CHR_TYPE_NULL: case VIR_DOMAIN_CHR_TYPE_VC: backend_type = "null"; diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 0ce963222f9c..351425fedd15 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -2820,7 +2820,7 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr caps, /* The parser requires /proc/pid, which only exists on platforms * like Linux where pid_t fits in int. */ - if ((int) pid != pid || + if ((int)pid != pid || qemuParseProcFileStrings(pid, "cmdline", &progargv) < 0 || qemuParseProcFileStrings(pid, "environ", &progenv) < 0) goto cleanup; @@ -2829,13 +2829,13 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr caps, pidfile, monConfig, monJSON))) goto cleanup; - if (virAsprintf(&exepath, "/proc/%d/exe", (int) pid) < 0) + if (virAsprintf(&exepath, "/proc/%d/exe", (int)pid) < 0) goto cleanup; if (virFileResolveLink(exepath, &emulator) < 0) { virReportSystemError(errno, _("Unable to resolve %s for pid %u"), - exepath, (int) pid); + exepath, (int)pid); goto cleanup; } VIR_FREE(def->emulator); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 6a5262ae46ab..c668546cc21f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2131,7 +2131,7 @@ qemuRefreshRTC(virQEMUDriverPtr driver, return; thenbits.tm_isdst = -1; - if ((then = mktime(&thenbits)) == (time_t) -1) { + if ((then = mktime(&thenbits)) == (time_t)-1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to convert time")); return; @@ -3301,7 +3301,7 @@ qemuProcessUpdateDevices(virQEMUDriverPtr driver, if (qemuDomainUpdateDeviceList(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) goto cleanup; - qemuDevices = (const char **) priv->qemuDevices; + qemuDevices = (const char **)priv->qemuDevices; if ((tmp = old)) { while (*tmp) { if (!virStringListHasString(qemuDevices, *tmp) && @@ -6026,7 +6026,7 @@ qemuProcessLaunch(virConnectPtr conn, rv = -1; } VIR_DEBUG("QEMU vm=%p name=%s running with pid=%lld", - vm, vm->def->name, (long long) vm->pid); + vm, vm->def->name, (long long)vm->pid); } else { VIR_DEBUG("QEMU vm=%p name=%s failed to spawn", vm, vm->def->name); @@ -6435,7 +6435,7 @@ qemuProcessKill(virDomainObjPtr vm, unsigned int flags) VIR_DEBUG("vm=%p name=%s pid=%lld flags=0x%x", vm, vm->def->name, - (long long) vm->pid, flags); + (long long)vm->pid, flags); if (!(flags & VIR_QEMU_PROCESS_KILL_NOCHECK)) { if (!virDomainObjIsActive(vm)) { @@ -6516,7 +6516,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, VIR_DEBUG("Shutting down vm=%p name=%s id=%d pid=%lld, " "reason=%s, asyncJob=%s, flags=0x%x", vm, vm->def->name, vm->def->id, - (long long) vm->pid, + (long long)vm->pid, virDomainShutoffReasonTypeToString(reason), qemuDomainAsyncJobTypeToString(asyncJob), flags); -- 2.17.0
On Wed, Apr 25, 2018 at 03:24:51PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/qemu/qemu_agent.c | 4 +- src/qemu/qemu_alias.c | 2 +- src/qemu/qemu_block.c | 2 +- src/qemu/qemu_capabilities.c | 20 +++++----- src/qemu/qemu_command.c | 18 ++++----- src/qemu/qemu_domain.c | 32 ++++++++-------- src/qemu/qemu_domain_address.c | 12 +++--- src/qemu/qemu_driver.c | 68 +++++++++++++++++----------------- src/qemu/qemu_hostdev.c | 2 +- src/qemu/qemu_hotplug.c | 8 ++-- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor_json.c | 4 +- src/qemu/qemu_parse_command.c | 6 +-- src/qemu/qemu_process.c | 10 ++--- 15 files changed, 96 insertions(+), 96 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/remote/remote_daemon_dispatch.c | 50 +-- src/remote/remote_daemon_stream.c | 2 +- src/remote/remote_driver.c | 620 ++++++++++++++-------------- src/remote/remote_protocol.x | 18 +- 4 files changed, 345 insertions(+), 345 deletions(-) diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index a8a5932d7134..b322e373e4cc 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -1062,7 +1062,7 @@ remoteRelayDomainEventTunable(virConnectPtr conn, make_nonnull_domain(&data.dom, dom); if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &data.params.params_val, + (virTypedParameterRemotePtr *)&data.params.params_val, &data.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { VIR_FREE(data.dom.name); @@ -1204,7 +1204,7 @@ remoteRelayDomainEventJobCompleted(virConnectPtr conn, make_nonnull_domain(&data.dom, dom); if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &data.params.params_val, + (virTypedParameterRemotePtr *)&data.params.params_val, &data.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { VIR_FREE(data.dom.name); @@ -1934,7 +1934,7 @@ remoteDispatchDomainGetSchedulerParameters(virNetServerPtr server ATTRIBUTE_UNUS goto cleanup; if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &ret->params.params_val, + (virTypedParameterRemotePtr *)&ret->params.params_val, &ret->params.params_len, 0) < 0) goto cleanup; @@ -1985,7 +1985,7 @@ remoteDispatchDomainGetSchedulerParametersFlags(virNetServerPtr server ATTRIBUTE goto cleanup; if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &ret->params.params_val, + (virTypedParameterRemotePtr *)&ret->params.params_val, &ret->params.params_len, args->flags) < 0) goto cleanup; @@ -2159,7 +2159,7 @@ remoteDispatchDomainBlockStatsFlags(virNetServerPtr server ATTRIBUTE_UNUSED, /* Serialize the block stats. */ if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &ret->params.params_val, + (virTypedParameterRemotePtr *)&ret->params.params_val, &ret->params.params_len, args->flags) < 0) goto cleanup; @@ -2421,7 +2421,7 @@ remoteDispatchDomainGetVcpuPinInfo(virNetServerPtr server ATTRIBUTE_UNUSED, * Note that remoteDispatchClientRequest will free. */ ret->cpumaps.cpumaps_len = args->ncpumaps * args->maplen; - ret->cpumaps.cpumaps_val = (char *) cpumaps; + ret->cpumaps.cpumaps_val = (char *)cpumaps; cpumaps = NULL; rv = 0; @@ -2455,7 +2455,7 @@ remoteDispatchDomainPinEmulator(virNetServerPtr server ATTRIBUTE_UNUSED, goto cleanup; if (virDomainPinEmulator(dom, - (unsigned char *) args->cpumap.cpumap_val, + (unsigned char *)args->cpumap.cpumap_val, args->cpumap.cpumap_len, args->flags) < 0) goto cleanup; @@ -2506,7 +2506,7 @@ remoteDispatchDomainGetEmulatorPinInfo(virNetServerPtr server ATTRIBUTE_UNUSED, ret->ret = r; ret->cpumaps.cpumaps_len = args->maplen; - ret->cpumaps.cpumaps_val = (char *) cpumaps; + ret->cpumaps.cpumaps_val = (char *)cpumaps; cpumaps = NULL; rv = 0; @@ -2584,7 +2584,7 @@ remoteDispatchDomainGetVcpus(virNetServerPtr server ATTRIBUTE_UNUSED, * Note that remoteDispatchClientRequest will free. */ ret->cpumaps.cpumaps_len = args->maxinfo * args->maplen; - ret->cpumaps.cpumaps_val = (char *) cpumaps; + ret->cpumaps.cpumaps_val = (char *)cpumaps; cpumaps = NULL; rv = 0; @@ -2825,7 +2825,7 @@ remoteDispatchDomainGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED, } if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &ret->params.params_val, + (virTypedParameterRemotePtr *)&ret->params.params_val, &ret->params.params_len, args->flags) < 0) goto cleanup; @@ -2887,7 +2887,7 @@ remoteDispatchDomainGetNumaParameters(virNetServerPtr server ATTRIBUTE_UNUSED, } if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &ret->params.params_val, + (virTypedParameterRemotePtr *)&ret->params.params_val, &ret->params.params_len, flags) < 0) goto cleanup; @@ -2949,7 +2949,7 @@ remoteDispatchDomainGetBlkioParameters(virNetServerPtr server ATTRIBUTE_UNUSED, } if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &ret->params.params_val, + (virTypedParameterRemotePtr *)&ret->params.params_val, &ret->params.params_len, args->flags) < 0) goto cleanup; @@ -3141,7 +3141,7 @@ remoteDispatchDomainGetPerfEvents(virNetServerPtr server ATTRIBUTE_UNUSED, } if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &ret->params.params_val, + (virTypedParameterRemotePtr *)&ret->params.params_val, &ret->params.params_len, 0) < 0) goto cleanup; @@ -3242,7 +3242,7 @@ remoteDispatchDomainGetBlockIoTune(virNetServerPtr server ATTRIBUTE_UNUSED, /* Serialize the block I/O tuning parameters. */ if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &ret->params.params_val, + (virTypedParameterRemotePtr *)&ret->params.params_val, &ret->params.params_len, args->flags) < 0) goto cleanup; @@ -3287,7 +3287,7 @@ remoteDispatchAuthList(virNetServerPtr server, } else if (callerUid == 0) { char *ident; if (virAsprintf(&ident, "pid:%lld,uid:%d", - (long long) callerPid, (int) callerUid) < 0) + (long long)callerPid, (int)callerUid) < 0) goto cleanup; VIR_INFO("Bypass polkit auth for privileged client %s", ident); virNetServerSetClientAuthenticated(server, client); @@ -3736,7 +3736,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server, } VIR_INFO("Checking PID %lld running as %d", - (long long) callerPid, callerUid); + (long long)callerPid, callerUid); rv = virPolkitCheckAuth(action, callerPid, @@ -3753,7 +3753,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server, "client=%p auth=%d identity=%s", client, REMOTE_AUTH_POLKIT, ident); VIR_INFO("Policy allowed action %s from pid %lld, uid %d", - action, (long long) callerPid, callerUid); + action, (long long)callerPid, callerUid); ret->complete = 1; virNetServerSetClientAuthenticated(server, client); @@ -4854,7 +4854,7 @@ remoteDispatchDomainGetInterfaceParameters(virNetServerPtr server ATTRIBUTE_UNUS } if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &ret->params.params_val, + (virTypedParameterRemotePtr *)&ret->params.params_val, &ret->params.params_len, flags) < 0) goto cleanup; @@ -4916,7 +4916,7 @@ remoteDispatchDomainGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED, goto success; if (virTypedParamsSerialize(params, args->nparams * args->ncpus, - (virTypedParameterRemotePtr *) &ret->params.params_val, + (virTypedParameterRemotePtr *)&ret->params.params_val, &ret->params.params_len, args->flags) < 0) goto cleanup; @@ -5044,7 +5044,7 @@ remoteDispatchNodeGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED, } if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &ret->params.params_val, + (virTypedParameterRemotePtr *)&ret->params.params_val, &ret->params.params_len, args->flags) < 0) goto cleanup; @@ -5090,7 +5090,7 @@ remoteDispatchNodeGetCPUMap(virNetServerPtr server ATTRIBUTE_UNUSED, /* 'serialize' return cpumap */ if (args->need_map) { ret->cpumap.cpumap_len = VIR_CPU_MAPLEN(cpunum); - ret->cpumap.cpumap_val = (char *) cpumap; + ret->cpumap.cpumap_val = (char *)cpumap; cpumap = NULL; } @@ -5191,7 +5191,7 @@ remoteDispatchDomainGetJobStats(virNetServerPtr server ATTRIBUTE_UNUSED, } if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &ret->params.params_val, + (virTypedParameterRemotePtr *)&ret->params.params_val, &ret->params.params_len, 0) < 0) goto cleanup; @@ -6391,7 +6391,7 @@ remoteDispatchNodeGetFreePages(virNetServerPtr server ATTRIBUTE_UNUSED, args->pages.pages_val, args->startCell, args->cellCount, - (unsigned long long *) ret->counts.counts_val, + (unsigned long long *)ret->counts.counts_val, args->flags)) <= 0) goto cleanup; @@ -6601,7 +6601,7 @@ remoteDispatchConnectGetAllDomainStats(virNetServerPtr server ATTRIBUTE_UNUSED, if (virTypedParamsSerialize(retStats[i]->params, retStats[i]->nparams, - (virTypedParameterRemotePtr *) &dst->params.params_val, + (virTypedParameterRemotePtr *)&dst->params.params_val, &dst->params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) goto cleanup; @@ -6645,7 +6645,7 @@ remoteDispatchNodeAllocPages(virNetServerPtr server ATTRIBUTE_UNUSED, if ((len = virNodeAllocPages(priv->conn, args->pageSizes.pageSizes_len, args->pageSizes.pageSizes_val, - (unsigned long long *) args->pageCounts.pageCounts_val, + (unsigned long long *)args->pageCounts.pageCounts_val, args->startCell, args->cellCount, args->flags)) < 0) diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_stream.c index 38d50d1d1c60..27862b961e10 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -687,7 +687,7 @@ daemonStreamHandleHole(virNetServerClientPtr client, } if (virNetMessageDecodePayload(msg, - (xdrproc_t) xdr_virNetStreamHole, + (xdrproc_t)xdr_virNetStreamHole, &data) < 0) return -1; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 95437b43657e..8ee9dc988dea 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -681,8 +681,8 @@ remoteConnectSupportsFeatureUnlocked(virConnectPtr conn, int rc; rc = call(conn, priv, 0, REMOTE_PROC_CONNECT_SUPPORTS_FEATURE, - (xdrproc_t)xdr_remote_connect_supports_feature_args, (char *) &args, - (xdrproc_t)xdr_remote_connect_supports_feature_ret, (char *) &ret); + (xdrproc_t)xdr_remote_connect_supports_feature_args, (char *)&args, + (xdrproc_t)xdr_remote_connect_supports_feature_ret, (char *)&ret); return rc != -1 && ret.supported; } @@ -1209,8 +1209,8 @@ doRemoteOpen(virConnectPtr conn, VIR_DEBUG("Trying to open URI %s", name); if (call(conn, priv, 0, REMOTE_PROC_CONNECT_OPEN, - (xdrproc_t) xdr_remote_connect_open_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_remote_connect_open_args, (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto failed; } @@ -1222,8 +1222,8 @@ doRemoteOpen(virConnectPtr conn, memset(&uriret, 0, sizeof(uriret)); if (call(conn, priv, 0, REMOTE_PROC_CONNECT_GET_URI, - (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_remote_connect_get_uri_ret, (char *) &uriret) < 0) + (xdrproc_t)xdr_void, (char *) NULL, + (xdrproc_t)xdr_remote_connect_get_uri_ret, (char *)&uriret) < 0) goto failed; VIR_DEBUG("Auto-probed URI is %s", uriret.uri); @@ -1406,8 +1406,8 @@ doRemoteClose(virConnectPtr conn, struct private_data *priv) int ret = 0; if (call(conn, priv, 0, REMOTE_PROC_CONNECT_CLOSE, - (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_void, (char *) NULL, + (xdrproc_t)xdr_void, (char *) NULL) == -1) ret = -1; #ifdef WITH_GNUTLS @@ -1488,8 +1488,8 @@ remoteConnectGetType(virConnectPtr conn) memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_CONNECT_GET_TYPE, - (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_remote_connect_get_type_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_void, (char *) NULL, + (xdrproc_t)xdr_remote_connect_get_type_ret, (char *)&ret) == -1) goto done; /* Stash. */ @@ -1509,8 +1509,8 @@ static int remoteConnectIsSecure(virConnectPtr conn) memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_CONNECT_IS_SECURE, - (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_remote_connect_is_secure_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_void, (char *) NULL, + (xdrproc_t)xdr_remote_connect_is_secure_ret, (char *)&ret) == -1) goto done; /* We claim to be secure, if the remote driver @@ -1538,8 +1538,8 @@ static int remoteConnectIsEncrypted(virConnectPtr conn) memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_CONNECT_IS_SECURE, - (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_remote_connect_is_secure_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_void, (char *) NULL, + (xdrproc_t)xdr_remote_connect_is_secure_ret, (char *)&ret) == -1) goto done; encrypted = virNetClientIsEncrypted(priv->client); @@ -1579,10 +1579,10 @@ remoteNodeGetCPUStats(virConnectPtr conn, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_NODE_GET_CPU_STATS, - (xdrproc_t) xdr_remote_node_get_cpu_stats_args, - (char *) &args, - (xdrproc_t) xdr_remote_node_get_cpu_stats_ret, - (char *) &ret) == -1) + (xdrproc_t)xdr_remote_node_get_cpu_stats_args, + (char *)&args, + (xdrproc_t)xdr_remote_node_get_cpu_stats_ret, + (char *)&ret) == -1) goto done; /* Check the length of the returned list carefully. */ @@ -1618,7 +1618,7 @@ remoteNodeGetCPUStats(virConnectPtr conn, rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_remote_node_get_cpu_stats_ret, (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_node_get_cpu_stats_ret, (char *)&ret); done: remoteDriverUnlock(priv); return rv; @@ -1645,8 +1645,8 @@ remoteNodeGetMemoryStats(virConnectPtr conn, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_NODE_GET_MEMORY_STATS, - (xdrproc_t) xdr_remote_node_get_memory_stats_args, (char *) &args, - (xdrproc_t) xdr_remote_node_get_memory_stats_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_node_get_memory_stats_args, (char *)&args, + (xdrproc_t)xdr_remote_node_get_memory_stats_ret, (char *)&ret) == -1) goto done; /* Check the length of the returned list carefully. */ @@ -1682,7 +1682,7 @@ remoteNodeGetMemoryStats(virConnectPtr conn, rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_remote_node_get_memory_stats_ret, (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_node_get_memory_stats_ret, (char *)&ret); done: remoteDriverUnlock(priv); return rv; @@ -1714,14 +1714,14 @@ remoteNodeGetCellsFreeMemory(virConnectPtr conn, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_NODE_GET_CELLS_FREE_MEMORY, - (xdrproc_t) xdr_remote_node_get_cells_free_memory_args, (char *)&args, - (xdrproc_t) xdr_remote_node_get_cells_free_memory_ret, (char *)&ret) == -1) + (xdrproc_t)xdr_remote_node_get_cells_free_memory_args, (char *)&args, + (xdrproc_t)xdr_remote_node_get_cells_free_memory_ret, (char *)&ret) == -1) goto done; for (i = 0; i < ret.cells.cells_len; i++) freeMems[i] = ret.cells.cells_val[i]; - xdr_free((xdrproc_t) xdr_remote_node_get_cells_free_memory_ret, (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_node_get_cells_free_memory_ret, (char *)&ret); rv = ret.cells.cells_len; @@ -1751,8 +1751,8 @@ remoteConnectListDomains(virConnectPtr conn, int *ids, int maxids) memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_CONNECT_LIST_DOMAINS, - (xdrproc_t) xdr_remote_connect_list_domains_args, (char *) &args, - (xdrproc_t) xdr_remote_connect_list_domains_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_connect_list_domains_args, (char *)&args, + (xdrproc_t)xdr_remote_connect_list_domains_ret, (char *)&ret) == -1) goto done; if (ret.ids.ids_len > maxids) { @@ -1768,7 +1768,7 @@ remoteConnectListDomains(virConnectPtr conn, int *ids, int maxids) rv = ret.ids.ids_len; cleanup: - xdr_free((xdrproc_t) xdr_remote_connect_list_domains_ret, (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_connect_list_domains_ret, (char *)&ret); done: remoteDriverUnlock(priv); @@ -1822,13 +1822,13 @@ remoteDomainBlockStatsFlags(virDomainPtr domain, make_nonnull_domain(&args.dom, domain); args.nparams = *nparams; - args.path = (char *) path; + args.path = (char *)path; args.flags = flags; memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_BLOCK_STATS_FLAGS, - (xdrproc_t) xdr_remote_domain_block_stats_flags_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_block_stats_flags_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_block_stats_flags_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_block_stats_flags_ret, (char *)&ret) == -1) goto done; /* Check the length of the returned list carefully. */ @@ -1862,8 +1862,8 @@ remoteDomainBlockStatsFlags(virDomainPtr domain, rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_remote_domain_block_stats_flags_ret, - (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_domain_block_stats_flags_ret, + (char *)&ret); done: remoteDriverUnlock(priv); return rv; @@ -1887,8 +1887,8 @@ remoteDomainGetMemoryParameters(virDomainPtr domain, memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_MEMORY_PARAMETERS, - (xdrproc_t) xdr_remote_domain_get_memory_parameters_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_get_memory_parameters_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_get_memory_parameters_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_get_memory_parameters_ret, (char *)&ret) == -1) goto done; /* Handle the case when the caller does not know the number of parameters @@ -1910,8 +1910,8 @@ remoteDomainGetMemoryParameters(virDomainPtr domain, rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_remote_domain_get_memory_parameters_ret, - (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_domain_get_memory_parameters_ret, + (char *)&ret); done: remoteDriverUnlock(priv); return rv; @@ -1935,8 +1935,8 @@ remoteDomainGetNumaParameters(virDomainPtr domain, memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_NUMA_PARAMETERS, - (xdrproc_t) xdr_remote_domain_get_numa_parameters_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_get_numa_parameters_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_get_numa_parameters_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_get_numa_parameters_ret, (char *)&ret) == -1) goto done; /* Handle the case when the caller does not know the number of parameters @@ -1958,8 +1958,8 @@ remoteDomainGetNumaParameters(virDomainPtr domain, rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_remote_domain_get_numa_parameters_ret, - (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_domain_get_numa_parameters_ret, + (char *)&ret); done: remoteDriverUnlock(priv); return rv; @@ -1983,8 +1983,8 @@ remoteDomainGetPerfEvents(virDomainPtr domain, memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_PERF_EVENTS, - (xdrproc_t) xdr_remote_domain_get_perf_events_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_get_perf_events_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_get_perf_events_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_get_perf_events_ret, (char *)&ret) == -1) goto done; if (virTypedParamsDeserialize((virTypedParameterRemotePtr) ret.params.params_val, @@ -1997,8 +1997,8 @@ remoteDomainGetPerfEvents(virDomainPtr domain, rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_remote_domain_get_perf_events_ret, - (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_domain_get_perf_events_ret, + (char *)&ret); done: remoteDriverUnlock(priv); return rv; @@ -2022,8 +2022,8 @@ remoteDomainGetBlkioParameters(virDomainPtr domain, memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_BLKIO_PARAMETERS, - (xdrproc_t) xdr_remote_domain_get_blkio_parameters_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_get_blkio_parameters_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_get_blkio_parameters_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_get_blkio_parameters_ret, (char *)&ret) == -1) goto done; /* Handle the case when the caller does not know the number of parameters @@ -2045,8 +2045,8 @@ remoteDomainGetBlkioParameters(virDomainPtr domain, rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_remote_domain_get_blkio_parameters_ret, - (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_domain_get_blkio_parameters_ret, + (char *)&ret); done: remoteDriverUnlock(priv); return rv; @@ -2090,10 +2090,10 @@ remoteDomainGetVcpuPinInfo(virDomainPtr domain, memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_VCPU_PIN_INFO, - (xdrproc_t) xdr_remote_domain_get_vcpu_pin_info_args, - (char *) &args, - (xdrproc_t) xdr_remote_domain_get_vcpu_pin_info_ret, - (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_get_vcpu_pin_info_args, + (char *)&args, + (xdrproc_t)xdr_remote_domain_get_vcpu_pin_info_ret, + (char *)&ret) == -1) goto done; if (ret.num > ncpumaps) { @@ -2118,7 +2118,7 @@ remoteDomainGetVcpuPinInfo(virDomainPtr domain, rv = ret.num; cleanup: - xdr_free((xdrproc_t) xdr_remote_domain_get_vcpu_pin_info_ret, (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_domain_get_vcpu_pin_info_ret, (char *)&ret); done: remoteDriverUnlock(priv); @@ -2150,9 +2150,9 @@ remoteDomainPinEmulator(virDomainPtr dom, args.flags = flags; if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_PIN_EMULATOR, - (xdrproc_t) xdr_remote_domain_pin_emulator_args, - (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) { + (xdrproc_t)xdr_remote_domain_pin_emulator_args, + (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) { goto done; } @@ -2193,10 +2193,10 @@ remoteDomainGetEmulatorPinInfo(virDomainPtr domain, memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_EMULATOR_PIN_INFO, - (xdrproc_t) xdr_remote_domain_get_emulator_pin_info_args, - (char *) &args, - (xdrproc_t) xdr_remote_domain_get_emulator_pin_info_ret, - (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_get_emulator_pin_info_args, + (char *)&args, + (xdrproc_t)xdr_remote_domain_get_emulator_pin_info_ret, + (char *)&ret) == -1) goto done; if (ret.cpumaps.cpumaps_len > maplen) { @@ -2214,8 +2214,8 @@ remoteDomainGetEmulatorPinInfo(virDomainPtr domain, rv = ret.ret; cleanup: - xdr_free((xdrproc_t) xdr_remote_domain_get_emulator_pin_info_ret, - (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_domain_get_emulator_pin_info_ret, + (char *)&ret); done: remoteDriverUnlock(priv); @@ -2257,8 +2257,8 @@ remoteDomainGetVcpus(virDomainPtr domain, memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_VCPUS, - (xdrproc_t) xdr_remote_domain_get_vcpus_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_get_vcpus_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_get_vcpus_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_get_vcpus_ret, (char *)&ret) == -1) goto done; if (ret.info.info_len > maxinfo) { @@ -2290,7 +2290,7 @@ remoteDomainGetVcpus(virDomainPtr domain, rv = ret.info.info_len; cleanup: - xdr_free((xdrproc_t) xdr_remote_domain_get_vcpus_ret, (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_domain_get_vcpus_ret, (char *)&ret); done: remoteDriverUnlock(priv); @@ -2368,7 +2368,7 @@ remoteDomainGetIOThreadInfo(virDomainPtr dom, VIR_FREE(info_ret); } xdr_free((xdrproc_t)xdr_remote_domain_get_iothread_info_ret, - (char *) &ret); + (char *)&ret); done: remoteDriverUnlock(priv); @@ -2390,8 +2390,8 @@ remoteDomainGetSecurityLabel(virDomainPtr domain, virSecurityLabelPtr seclabel) memset(seclabel, 0, sizeof(*seclabel)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_SECURITY_LABEL, - (xdrproc_t) xdr_remote_domain_get_security_label_args, (char *)&args, - (xdrproc_t) xdr_remote_domain_get_security_label_ret, (char *)&ret) == -1) { + (xdrproc_t)xdr_remote_domain_get_security_label_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_get_security_label_ret, (char *)&ret) == -1) { goto done; } @@ -2408,7 +2408,7 @@ remoteDomainGetSecurityLabel(virDomainPtr domain, virSecurityLabelPtr seclabel) rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_remote_domain_get_security_label_ret, (char *)&ret); + xdr_free((xdrproc_t)xdr_remote_domain_get_security_label_ret, (char *)&ret); done: remoteDriverUnlock(priv); @@ -2430,8 +2430,8 @@ remoteDomainGetSecurityLabelList(virDomainPtr domain, virSecurityLabelPtr* secla memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_SECURITY_LABEL_LIST, - (xdrproc_t) xdr_remote_domain_get_security_label_list_args, (char *)&args, - (xdrproc_t) xdr_remote_domain_get_security_label_list_ret, (char *)&ret) == -1) { + (xdrproc_t)xdr_remote_domain_get_security_label_list_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_get_security_label_list_ret, (char *)&ret) == -1) { goto done; } @@ -2454,7 +2454,7 @@ remoteDomainGetSecurityLabelList(virDomainPtr domain, virSecurityLabelPtr* secla rv = ret.ret; cleanup: - xdr_free((xdrproc_t) xdr_remote_domain_get_security_label_list_ret, (char *)&ret); + xdr_free((xdrproc_t)xdr_remote_domain_get_security_label_list_ret, (char *)&ret); done: remoteDriverUnlock(priv); @@ -2479,8 +2479,8 @@ remoteDomainGetState(virDomainPtr domain, memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_STATE, - (xdrproc_t) xdr_remote_domain_get_state_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_get_state_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_get_state_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_get_state_ret, (char *)&ret) == -1) goto done; *state = ret.state; @@ -2507,8 +2507,8 @@ remoteNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel) memset(secmodel, 0, sizeof(*secmodel)); if (call(conn, priv, 0, REMOTE_PROC_NODE_GET_SECURITY_MODEL, - (xdrproc_t) xdr_void, NULL, - (xdrproc_t) xdr_remote_node_get_security_model_ret, (char *)&ret) == -1) { + (xdrproc_t)xdr_void, NULL, + (xdrproc_t)xdr_remote_node_get_security_model_ret, (char *)&ret) == -1) { goto done; } @@ -2533,7 +2533,7 @@ remoteNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel) rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_remote_node_get_security_model_ret, (char *)&ret); + xdr_free((xdrproc_t)xdr_remote_node_get_security_model_ret, (char *)&ret); done: remoteDriverUnlock(priv); @@ -2554,15 +2554,15 @@ remoteDomainMigratePrepare(virConnectPtr dconn, remoteDriverLock(priv); - args.uri_in = uri_in == NULL ? NULL : (char **) &uri_in; + args.uri_in = uri_in == NULL ? NULL : (char **)&uri_in; args.flags = flags; - args.dname = dname == NULL ? NULL : (char **) &dname; + args.dname = dname == NULL ? NULL : (char **)&dname; args.resource = resource; memset(&ret, 0, sizeof(ret)); if (call(dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE, - (xdrproc_t) xdr_remote_domain_migrate_prepare_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_migrate_prepare_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_migrate_prepare_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_migrate_prepare_ret, (char *)&ret) == -1) goto done; if (ret.cookie.cookie_len > 0) { @@ -2595,16 +2595,16 @@ remoteDomainMigratePrepare2(virConnectPtr dconn, remoteDriverLock(priv); - args.uri_in = uri_in == NULL ? NULL : (char **) &uri_in; + args.uri_in = uri_in == NULL ? NULL : (char **)&uri_in; args.flags = flags; - args.dname = dname == NULL ? NULL : (char **) &dname; + args.dname = dname == NULL ? NULL : (char **)&dname; args.resource = resource; - args.dom_xml = (char *) dom_xml; + args.dom_xml = (char *)dom_xml; memset(&ret, 0, sizeof(ret)); if (call(dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE2, - (xdrproc_t) xdr_remote_domain_migrate_prepare2_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_migrate_prepare2_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_migrate_prepare2_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_migrate_prepare2_ret, (char *)&ret) == -1) goto done; if (ret.cookie.cookie_len > 0) { @@ -2653,8 +2653,8 @@ remoteDomainCreate(virDomainPtr domain) make_nonnull_domain(&args.dom, domain); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_CREATE, - (xdrproc_t) xdr_remote_domain_create_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_remote_domain_create_args, (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto done; /* Need to do a lookup figure out ID of newly started guest, because @@ -2664,12 +2664,12 @@ remoteDomainCreate(virDomainPtr domain) memcpy(args2.uuid, domain->uuid, VIR_UUID_BUFLEN); memset(&ret2, 0, sizeof(ret2)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_LOOKUP_BY_UUID, - (xdrproc_t) xdr_remote_domain_lookup_by_uuid_args, (char *) &args2, - (xdrproc_t) xdr_remote_domain_lookup_by_uuid_ret, (char *) &ret2) == -1) + (xdrproc_t)xdr_remote_domain_lookup_by_uuid_args, (char *)&args2, + (xdrproc_t)xdr_remote_domain_lookup_by_uuid_ret, (char *)&ret2) == -1) goto done; domain->id = ret2.dom.id; - xdr_free((xdrproc_t) &xdr_remote_domain_lookup_by_uuid_ret, (char *) &ret2); + xdr_free((xdrproc_t)&xdr_remote_domain_lookup_by_uuid_ret, (char *)&ret2); rv = 0; @@ -2692,8 +2692,8 @@ remoteDomainGetSchedulerType(virDomainPtr domain, int *nparams) memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_SCHEDULER_TYPE, - (xdrproc_t) xdr_remote_domain_get_scheduler_type_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_get_scheduler_type_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_get_scheduler_type_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_get_scheduler_type_ret, (char *)&ret) == -1) goto done; if (nparams) *nparams = ret.nparams; @@ -2732,10 +2732,10 @@ remoteDomainMemoryStats(virDomainPtr domain, memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_MEMORY_STATS, - (xdrproc_t) xdr_remote_domain_memory_stats_args, - (char *) &args, - (xdrproc_t) xdr_remote_domain_memory_stats_ret, - (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_memory_stats_args, + (char *)&args, + (xdrproc_t)xdr_remote_domain_memory_stats_ret, + (char *)&ret) == -1) goto done; for (i = 0; i < ret.stats.stats_len; i++) { @@ -2743,7 +2743,7 @@ remoteDomainMemoryStats(virDomainPtr domain, stats[i].val = ret.stats.stats_val[i].val; } rv = ret.stats.stats_len; - xdr_free((xdrproc_t) xdr_remote_domain_memory_stats_ret, (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_domain_memory_stats_ret, (char *)&ret); done: remoteDriverUnlock(priv); @@ -2773,17 +2773,17 @@ remoteDomainBlockPeek(virDomainPtr domain, } make_nonnull_domain(&args.dom, domain); - args.path = (char *) path; + args.path = (char *)path; args.offset = offset; args.size = size; args.flags = flags; memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_BLOCK_PEEK, - (xdrproc_t) xdr_remote_domain_block_peek_args, - (char *) &args, - (xdrproc_t) xdr_remote_domain_block_peek_ret, - (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_block_peek_args, + (char *)&args, + (xdrproc_t)xdr_remote_domain_block_peek_ret, + (char *)&ret) == -1) goto done; if (ret.buffer.buffer_len != size) { @@ -2831,10 +2831,10 @@ remoteDomainMemoryPeek(virDomainPtr domain, memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_MEMORY_PEEK, - (xdrproc_t) xdr_remote_domain_memory_peek_args, - (char *) &args, - (xdrproc_t) xdr_remote_domain_memory_peek_ret, - (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_memory_peek_args, + (char *)&args, + (xdrproc_t)xdr_remote_domain_memory_peek_ret, + (char *)&ret) == -1) goto done; if (ret.buffer.buffer_len != size) { @@ -2914,10 +2914,10 @@ 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, - (xdrproc_t) xdr_remote_domain_get_block_io_tune_ret, - (char *) &ret) == -1) { + (xdrproc_t)xdr_remote_domain_get_block_io_tune_args, + (char *)&args, + (xdrproc_t)xdr_remote_domain_get_block_io_tune_ret, + (char *)&ret) == -1) { goto done; } @@ -2940,8 +2940,8 @@ static int remoteDomainGetBlockIoTune(virDomainPtr domain, rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_remote_domain_get_block_io_tune_ret, - (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_domain_get_block_io_tune_ret, + (char *)&ret); done: remoteDriverUnlock(priv); return rv; @@ -2984,10 +2984,10 @@ static int remoteDomainGetCPUStats(virDomainPtr domain, memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_CPU_STATS, - (xdrproc_t) xdr_remote_domain_get_cpu_stats_args, - (char *) &args, - (xdrproc_t) xdr_remote_domain_get_cpu_stats_ret, - (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_get_cpu_stats_args, + (char *)&args, + (xdrproc_t)xdr_remote_domain_get_cpu_stats_ret, + (char *)&ret) == -1) goto done; /* Check the length of the returned list carefully. */ @@ -3032,8 +3032,8 @@ static int remoteDomainGetCPUStats(virDomainPtr domain, if (rv < 0) virTypedParamsClear(params, nparams * ncpus); - xdr_free((xdrproc_t) xdr_remote_domain_get_cpu_stats_ret, - (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_domain_get_cpu_stats_ret, + (char *)&ret); done: remoteDriverUnlock(priv); return rv; @@ -3077,8 +3077,8 @@ remoteConnectNetworkEventRegisterAny(virConnectPtr conn, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_CONNECT_NETWORK_EVENT_REGISTER_ANY, - (xdrproc_t) xdr_remote_connect_network_event_register_any_args, (char *) &args, - (xdrproc_t) xdr_remote_connect_network_event_register_any_ret, (char *) &ret) == -1) { + (xdrproc_t)xdr_remote_connect_network_event_register_any_args, (char *)&args, + (xdrproc_t)xdr_remote_connect_network_event_register_any_ret, (char *)&ret) == -1) { virObjectEventStateDeregisterID(conn, priv->eventState, callbackID, false); goto done; @@ -3122,8 +3122,8 @@ remoteConnectNetworkEventDeregisterAny(virConnectPtr conn, args.callbackID = remoteID; if (call(conn, priv, 0, REMOTE_PROC_CONNECT_NETWORK_EVENT_DEREGISTER_ANY, - (xdrproc_t) xdr_remote_connect_network_event_deregister_any_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_remote_connect_network_event_deregister_any_args, (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto done; } @@ -3171,8 +3171,8 @@ remoteConnectStoragePoolEventRegisterAny(virConnectPtr conn, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_CONNECT_STORAGE_POOL_EVENT_REGISTER_ANY, - (xdrproc_t) xdr_remote_connect_storage_pool_event_register_any_args, (char *) &args, - (xdrproc_t) xdr_remote_connect_storage_pool_event_register_any_ret, (char *) &ret) == -1) { + (xdrproc_t)xdr_remote_connect_storage_pool_event_register_any_args, (char *)&args, + (xdrproc_t)xdr_remote_connect_storage_pool_event_register_any_ret, (char *)&ret) == -1) { virObjectEventStateDeregisterID(conn, priv->eventState, callbackID, false); goto done; @@ -3216,8 +3216,8 @@ remoteConnectStoragePoolEventDeregisterAny(virConnectPtr conn, args.callbackID = remoteID; if (call(conn, priv, 0, REMOTE_PROC_CONNECT_STORAGE_POOL_EVENT_DEREGISTER_ANY, - (xdrproc_t) xdr_remote_connect_storage_pool_event_deregister_any_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_remote_connect_storage_pool_event_deregister_any_args, (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto done; } @@ -3267,8 +3267,8 @@ remoteConnectNodeDeviceEventRegisterAny(virConnectPtr conn, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_CONNECT_NODE_DEVICE_EVENT_REGISTER_ANY, - (xdrproc_t) xdr_remote_connect_node_device_event_register_any_args, (char *) &args, - (xdrproc_t) xdr_remote_connect_node_device_event_register_any_ret, (char *) &ret) == -1) { + (xdrproc_t)xdr_remote_connect_node_device_event_register_any_args, (char *)&args, + (xdrproc_t)xdr_remote_connect_node_device_event_register_any_ret, (char *)&ret) == -1) { virObjectEventStateDeregisterID(conn, priv->eventState, callbackID, false); goto done; @@ -3313,8 +3313,8 @@ remoteConnectNodeDeviceEventDeregisterAny(virConnectPtr conn, args.callbackID = remoteID; if (call(conn, priv, 0, REMOTE_PROC_CONNECT_NODE_DEVICE_EVENT_DEREGISTER_ANY, - (xdrproc_t) xdr_remote_connect_node_device_event_deregister_any_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_remote_connect_node_device_event_deregister_any_args, (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto done; } @@ -3364,8 +3364,8 @@ remoteConnectSecretEventRegisterAny(virConnectPtr conn, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_CONNECT_SECRET_EVENT_REGISTER_ANY, - (xdrproc_t) xdr_remote_connect_secret_event_register_any_args, (char *) &args, - (xdrproc_t) xdr_remote_connect_secret_event_register_any_ret, (char *) &ret) == -1) { + (xdrproc_t)xdr_remote_connect_secret_event_register_any_args, (char *)&args, + (xdrproc_t)xdr_remote_connect_secret_event_register_any_ret, (char *)&ret) == -1) { virObjectEventStateDeregisterID(conn, priv->eventState, callbackID, false); goto done; @@ -3410,8 +3410,8 @@ remoteConnectSecretEventDeregisterAny(virConnectPtr conn, args.callbackID = remoteID; if (call(conn, priv, 0, REMOTE_PROC_CONNECT_SECRET_EVENT_DEREGISTER_ANY, - (xdrproc_t) xdr_remote_connect_secret_event_deregister_any_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_remote_connect_secret_event_deregister_any_args, (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto done; } @@ -3459,13 +3459,13 @@ remoteConnectDomainQemuMonitorEventRegister(virConnectPtr conn, } else { args.dom = NULL; } - args.event = event ? (char **) &event : NULL; + args.event = event ? (char **)&event : NULL; args.flags = flags; memset(&ret, 0, sizeof(ret)); if (call(conn, priv, REMOTE_CALL_QEMU, QEMU_PROC_CONNECT_DOMAIN_MONITOR_EVENT_REGISTER, - (xdrproc_t) xdr_qemu_connect_domain_monitor_event_register_args, (char *) &args, - (xdrproc_t) xdr_qemu_connect_domain_monitor_event_register_ret, (char *) &ret) == -1) { + (xdrproc_t)xdr_qemu_connect_domain_monitor_event_register_args, (char *)&args, + (xdrproc_t)xdr_qemu_connect_domain_monitor_event_register_ret, (char *)&ret) == -1) { virObjectEventStateDeregisterID(conn, priv->eventState, callbackID, false); goto done; @@ -3508,8 +3508,8 @@ remoteConnectDomainQemuMonitorEventDeregister(virConnectPtr conn, args.callbackID = remoteID; if (call(conn, priv, REMOTE_CALL_QEMU, QEMU_PROC_CONNECT_DOMAIN_MONITOR_EVENT_DEREGISTER, - (xdrproc_t) xdr_qemu_connect_domain_monitor_event_deregister_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_qemu_connect_domain_monitor_event_deregister_args, (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto done; } @@ -3541,14 +3541,14 @@ remoteConnectFindStoragePoolSources(virConnectPtr conn, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_CONNECT_FIND_STORAGE_POOL_SOURCES, - (xdrproc_t) xdr_remote_connect_find_storage_pool_sources_args, (char *) &args, - (xdrproc_t) xdr_remote_connect_find_storage_pool_sources_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_connect_find_storage_pool_sources_args, (char *)&args, + (xdrproc_t)xdr_remote_connect_find_storage_pool_sources_ret, (char *)&ret) == -1) goto done; rv = ret.xml; ret.xml = NULL; /* To stop xdr_free free'ing it */ - xdr_free((xdrproc_t) xdr_remote_connect_find_storage_pool_sources_ret, (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_connect_find_storage_pool_sources_ret, (char *)&ret); done: remoteDriverUnlock(priv); @@ -3569,8 +3569,8 @@ remoteNodeDeviceDettach(virNodeDevicePtr dev) args.name = dev->name; if (call(dev->conn, priv, 0, REMOTE_PROC_NODE_DEVICE_DETTACH, - (xdrproc_t) xdr_remote_node_device_dettach_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_remote_node_device_dettach_args, (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto done; rv = 0; @@ -3596,8 +3596,8 @@ remoteNodeDeviceDetachFlags(virNodeDevicePtr dev, args.flags = flags; if (call(dev->conn, priv, 0, REMOTE_PROC_NODE_DEVICE_DETACH_FLAGS, - (xdrproc_t) xdr_remote_node_device_detach_flags_args, - (char *) &args, (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_remote_node_device_detach_flags_args, + (char *)&args, (xdrproc_t)xdr_void, (char *) NULL) == -1) goto done; rv = 0; @@ -3619,8 +3619,8 @@ remoteNodeDeviceReAttach(virNodeDevicePtr dev) args.name = dev->name; if (call(dev->conn, priv, 0, REMOTE_PROC_NODE_DEVICE_RE_ATTACH, - (xdrproc_t) xdr_remote_node_device_re_attach_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_remote_node_device_re_attach_args, (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto done; rv = 0; @@ -3644,8 +3644,8 @@ remoteNodeDeviceReset(virNodeDevicePtr dev) args.name = dev->name; if (call(dev->conn, priv, 0, REMOTE_PROC_NODE_DEVICE_RESET, - (xdrproc_t) xdr_remote_node_device_reset_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_remote_node_device_reset_args, (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto done; rv = 0; @@ -3669,8 +3669,8 @@ remoteAuthenticate(virConnectPtr conn, struct private_data *priv, memset(&ret, 0, sizeof(ret)); err = call(conn, priv, 0, REMOTE_PROC_AUTH_LIST, - (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_remote_auth_list_ret, (char *) &ret); + (xdrproc_t)xdr_void, (char *) NULL, + (xdrproc_t)xdr_remote_auth_list_ret, (char *)&ret); if (err < 0) { virErrorPtr verr = virGetLastError(); if (verr && verr->code == VIR_ERR_NO_SUPPORT) { @@ -4141,8 +4141,8 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv, /* First call is to inquire about supported mechanisms in the server */ memset(&iret, 0, sizeof(iret)); if (call(conn, priv, 0, REMOTE_PROC_AUTH_SASL_INIT, - (xdrproc_t) xdr_void, (char *)NULL, - (xdrproc_t) xdr_remote_auth_sasl_init_ret, (char *) &iret) != 0) + (xdrproc_t)xdr_void, (char *)NULL, + (xdrproc_t)xdr_remote_auth_sasl_init_ret, (char *)&iret) != 0) goto cleanup; @@ -4196,8 +4196,8 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv, /* Now send the initial auth data to the server */ memset(&sret, 0, sizeof(sret)); if (call(conn, priv, 0, REMOTE_PROC_AUTH_SASL_START, - (xdrproc_t) xdr_remote_auth_sasl_start_args, (char *) &sargs, - (xdrproc_t) xdr_remote_auth_sasl_start_ret, (char *) &sret) != 0) + (xdrproc_t)xdr_remote_auth_sasl_start_args, (char *)&sargs, + (xdrproc_t)xdr_remote_auth_sasl_start_ret, (char *)&sret) != 0) goto cleanup; complete = sret.complete; @@ -4252,8 +4252,8 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv, memset(&pret, 0, sizeof(pret)); if (call(conn, priv, 0, REMOTE_PROC_AUTH_SASL_STEP, - (xdrproc_t) xdr_remote_auth_sasl_step_args, (char *) &pargs, - (xdrproc_t) xdr_remote_auth_sasl_step_ret, (char *) &pret) != 0) + (xdrproc_t)xdr_remote_auth_sasl_step_args, (char *)&pargs, + (xdrproc_t)xdr_remote_auth_sasl_step_ret, (char *)&pret) != 0) goto cleanup; complete = pret.complete; @@ -4312,8 +4312,8 @@ remoteAuthPolkit(virConnectPtr conn, struct private_data *priv, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_AUTH_POLKIT, - (xdrproc_t) xdr_void, (char *)NULL, - (xdrproc_t) xdr_remote_auth_polkit_ret, (char *) &ret) != 0) { + (xdrproc_t)xdr_void, (char *)NULL, + (xdrproc_t)xdr_remote_auth_polkit_ret, (char *)&ret) != 0) { return -1; /* virError already set by call */ } @@ -4357,8 +4357,8 @@ remoteConnectDomainEventRegister(virConnectPtr conn, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_CALLBACK_REGISTER_ANY, - (xdrproc_t) xdr_remote_connect_domain_event_callback_register_any_args, (char *) &args, - (xdrproc_t) xdr_remote_connect_domain_event_callback_register_any_ret, (char *) &ret) == -1) { + (xdrproc_t)xdr_remote_connect_domain_event_callback_register_any_args, (char *)&args, + (xdrproc_t)xdr_remote_connect_domain_event_callback_register_any_ret, (char *)&ret) == -1) { virObjectEventStateDeregisterID(conn, priv->eventState, callbackID, false); goto done; @@ -4367,8 +4367,8 @@ remoteConnectDomainEventRegister(virConnectPtr conn, ret.callbackID); } else { if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER, - (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_void, (char *) NULL) == -1) { + (xdrproc_t)xdr_void, (char *) NULL, + (xdrproc_t)xdr_void, (char *) NULL) == -1) { virObjectEventStateDeregisterID(conn, priv->eventState, callbackID, false); goto done; @@ -4413,13 +4413,13 @@ remoteConnectDomainEventDeregister(virConnectPtr conn, if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_CALLBACK_DEREGISTER_ANY, - (xdrproc_t) xdr_remote_connect_domain_event_callback_deregister_any_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_remote_connect_domain_event_callback_deregister_any_args, (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto done; } else { if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER, - (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_void, (char *) NULL, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto done; } } @@ -5524,12 +5524,12 @@ remoteSecretGetValue(virSecretPtr secret, size_t *value_size, memset(&ret, 0, sizeof(ret)); if (call(secret->conn, priv, 0, REMOTE_PROC_SECRET_GET_VALUE, - (xdrproc_t) xdr_remote_secret_get_value_args, (char *) &args, - (xdrproc_t) xdr_remote_secret_get_value_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_secret_get_value_args, (char *)&args, + (xdrproc_t)xdr_remote_secret_get_value_ret, (char *)&ret) == -1) goto done; *value_size = ret.value.value_len; - rv = (unsigned char *) ret.value.value_val; /* Caller frees. */ + rv = (unsigned char *)ret.value.value_val; /* Caller frees. */ done: remoteDriverUnlock(priv); @@ -5899,8 +5899,8 @@ remoteConnectDomainEventRegisterAny(virConnectPtr conn, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_CALLBACK_REGISTER_ANY, - (xdrproc_t) xdr_remote_connect_domain_event_callback_register_any_args, (char *) &args, - (xdrproc_t) xdr_remote_connect_domain_event_callback_register_any_ret, (char *) &ret) == -1) { + (xdrproc_t)xdr_remote_connect_domain_event_callback_register_any_args, (char *)&args, + (xdrproc_t)xdr_remote_connect_domain_event_callback_register_any_ret, (char *)&ret) == -1) { virObjectEventStateDeregisterID(conn, priv->eventState, callbackID, false); goto done; @@ -5913,8 +5913,8 @@ remoteConnectDomainEventRegisterAny(virConnectPtr conn, args.eventID = eventID; if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER_ANY, - (xdrproc_t) xdr_remote_connect_domain_event_register_any_args, (char *) &args, - (xdrproc_t) xdr_void, (char *)NULL) == -1) { + (xdrproc_t)xdr_remote_connect_domain_event_register_any_args, (char *)&args, + (xdrproc_t)xdr_void, (char *)NULL) == -1) { virObjectEventStateDeregisterID(conn, priv->eventState, callbackID, false); goto done; @@ -5960,8 +5960,8 @@ remoteConnectDomainEventDeregisterAny(virConnectPtr conn, if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_CALLBACK_DEREGISTER_ANY, - (xdrproc_t) xdr_remote_connect_domain_event_callback_deregister_any_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_remote_connect_domain_event_callback_deregister_any_args, (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto done; } else { remote_connect_domain_event_deregister_any_args args; @@ -5969,8 +5969,8 @@ remoteConnectDomainEventDeregisterAny(virConnectPtr conn, args.eventID = eventID; if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER_ANY, - (xdrproc_t) xdr_remote_connect_domain_event_deregister_any_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_remote_connect_domain_event_deregister_any_args, (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto done; } } @@ -6002,8 +6002,8 @@ remoteDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, REMOTE_CALL_QEMU, QEMU_PROC_DOMAIN_MONITOR_COMMAND, - (xdrproc_t) xdr_qemu_domain_monitor_command_args, (char *) &args, - (xdrproc_t) xdr_qemu_domain_monitor_command_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_qemu_domain_monitor_command_args, (char *)&args, + (xdrproc_t)xdr_qemu_domain_monitor_command_ret, (char *)&ret) == -1) goto done; if (VIR_STRDUP(*result, ret.result) < 0) @@ -6012,7 +6012,7 @@ remoteDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_qemu_domain_monitor_command_ret, (char *) &ret); + xdr_free((xdrproc_t)xdr_qemu_domain_monitor_command_ret, (char *)&ret); done: remoteDriverUnlock(priv); @@ -6040,14 +6040,14 @@ remoteDomainMigrateBegin3(virDomainPtr domain, memset(&ret, 0, sizeof(ret)); make_nonnull_domain(&args.dom, domain); - args.xmlin = xmlin == NULL ? NULL : (char **) &xmlin; + args.xmlin = xmlin == NULL ? NULL : (char **)&xmlin; args.flags = flags; - args.dname = dname == NULL ? NULL : (char **) &dname; + args.dname = dname == NULL ? NULL : (char **)&dname; args.resource = resource; if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_BEGIN3, - (xdrproc_t) xdr_remote_domain_migrate_begin3_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_migrate_begin3_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_migrate_begin3_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_migrate_begin3_ret, (char *)&ret) == -1) goto done; if (ret.cookie_out.cookie_out_len > 0) { @@ -6097,16 +6097,16 @@ remoteDomainMigratePrepare3(virConnectPtr dconn, args.cookie_in.cookie_in_val = (char *)cookiein; args.cookie_in.cookie_in_len = cookieinlen; - args.uri_in = uri_in == NULL ? NULL : (char **) &uri_in; + args.uri_in = uri_in == NULL ? NULL : (char **)&uri_in; args.flags = flags; - args.dname = dname == NULL ? NULL : (char **) &dname; + args.dname = dname == NULL ? NULL : (char **)&dname; args.resource = resource; - args.dom_xml = (char *) dom_xml; + args.dom_xml = (char *)dom_xml; memset(&ret, 0, sizeof(ret)); if (call(dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE3, - (xdrproc_t) xdr_remote_domain_migrate_prepare3_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_migrate_prepare3_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_migrate_prepare3_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_migrate_prepare3_ret, (char *)&ret) == -1) goto done; if (ret.cookie_out.cookie_out_len > 0) { @@ -6182,13 +6182,13 @@ remoteDomainMigratePrepareTunnel3(virConnectPtr dconn, args.cookie_in.cookie_in_val = (char *)cookiein; args.cookie_in.cookie_in_len = cookieinlen; args.flags = flags; - args.dname = dname == NULL ? NULL : (char **) &dname; + args.dname = dname == NULL ? NULL : (char **)&dname; args.resource = resource; - args.dom_xml = (char *) dom_xml; + args.dom_xml = (char *)dom_xml; if (call(dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE_TUNNEL3, - (xdrproc_t) xdr_remote_domain_migrate_prepare_tunnel3_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_migrate_prepare_tunnel3_ret, (char *) &ret) == -1) { + (xdrproc_t)xdr_remote_domain_migrate_prepare_tunnel3_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_migrate_prepare_tunnel3_ret, (char *)&ret) == -1) { virNetClientRemoveStream(priv->client, netst); virObjectUnref(netst); goto done; @@ -6241,18 +6241,18 @@ remoteDomainMigratePerform3(virDomainPtr dom, make_nonnull_domain(&args.dom, dom); - args.xmlin = xmlin == NULL ? NULL : (char **) &xmlin; + args.xmlin = xmlin == NULL ? NULL : (char **)&xmlin; args.cookie_in.cookie_in_val = (char *)cookiein; args.cookie_in.cookie_in_len = cookieinlen; args.flags = flags; - args.dname = dname == NULL ? NULL : (char **) &dname; - args.uri = uri == NULL ? NULL : (char **) &uri; - args.dconnuri = dconnuri == NULL ? NULL : (char **) &dconnuri; + args.dname = dname == NULL ? NULL : (char **)&dname; + args.uri = uri == NULL ? NULL : (char **)&uri; + args.dconnuri = dconnuri == NULL ? NULL : (char **)&dconnuri; args.resource = resource; if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PERFORM3, - (xdrproc_t) xdr_remote_domain_migrate_perform3_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_migrate_perform3_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_migrate_perform3_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_migrate_perform3_ret, (char *)&ret) == -1) goto done; if (ret.cookie_out.cookie_out_len > 0) { @@ -6301,15 +6301,15 @@ remoteDomainMigrateFinish3(virConnectPtr dconn, args.cookie_in.cookie_in_val = (char *)cookiein; args.cookie_in.cookie_in_len = cookieinlen; - args.dname = (char *) dname; - args.uri = uri == NULL ? NULL : (char **) &uri; - args.dconnuri = dconnuri == NULL ? NULL : (char **) &dconnuri; + args.dname = (char *)dname; + args.uri = uri == NULL ? NULL : (char **)&uri; + args.dconnuri = dconnuri == NULL ? NULL : (char **)&dconnuri; args.flags = flags; args.cancelled = cancelled; if (call(dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_FINISH3, - (xdrproc_t) xdr_remote_domain_migrate_finish3_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_migrate_finish3_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_migrate_finish3_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_migrate_finish3_ret, (char *)&ret) == -1) goto done; rv = get_nonnull_domain(dconn, ret.dom); @@ -6326,7 +6326,7 @@ remoteDomainMigrateFinish3(virConnectPtr dconn, ret.cookie_out.cookie_out_len = 0; } - xdr_free((xdrproc_t) &xdr_remote_domain_migrate_finish3_ret, (char *) &ret); + xdr_free((xdrproc_t)&xdr_remote_domain_migrate_finish3_ret, (char *)&ret); done: remoteDriverUnlock(priv); @@ -6355,13 +6355,13 @@ remoteDomainMigrateConfirm3(virDomainPtr domain, make_nonnull_domain(&args.dom, domain); args.cookie_in.cookie_in_len = cookieinlen; - args.cookie_in.cookie_in_val = (char *) cookiein; + args.cookie_in.cookie_in_val = (char *)cookiein; args.flags = flags; args.cancelled = cancelled; if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_CONFIRM3, - (xdrproc_t) xdr_remote_domain_migrate_confirm3_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_remote_domain_migrate_confirm3_args, (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto done; rv = 0; @@ -6388,16 +6388,16 @@ remoteConnectGetCPUModelNames(virConnectPtr conn, remoteDriverLock(priv); - args.arch = (char *) arch; + args.arch = (char *)arch; args.need_results = !!models; args.flags = flags; memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_CONNECT_GET_CPU_MODEL_NAMES, - (xdrproc_t) xdr_remote_connect_get_cpu_model_names_args, - (char *) &args, - (xdrproc_t) xdr_remote_connect_get_cpu_model_names_ret, - (char *) &ret) < 0) + (xdrproc_t)xdr_remote_connect_get_cpu_model_names_args, + (char *)&args, + (xdrproc_t)xdr_remote_connect_get_cpu_model_names_ret, + (char *)&ret) < 0) goto done; /* Check the length of the returned list carefully. */ @@ -6426,7 +6426,7 @@ remoteConnectGetCPUModelNames(virConnectPtr conn, cleanup: virStringListFree(retmodels); - xdr_free((xdrproc_t) xdr_remote_connect_get_cpu_model_names_ret, (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_connect_get_cpu_model_names_ret, (char *)&ret); done: remoteDriverUnlock(priv); @@ -6456,8 +6456,8 @@ remoteDomainOpenGraphics(virDomainPtr dom, fdin, fdinlen, NULL, NULL, REMOTE_PROC_DOMAIN_OPEN_GRAPHICS, - (xdrproc_t) xdr_remote_domain_open_graphics_args, (char *) &args, - (xdrproc_t) xdr_void, NULL) == -1) + (xdrproc_t)xdr_remote_domain_open_graphics_args, (char *)&args, + (xdrproc_t)xdr_void, NULL) == -1) goto done; rv = 0; @@ -6490,8 +6490,8 @@ remoteDomainOpenGraphicsFD(virDomainPtr dom, NULL, 0, &fdout, &fdoutlen, REMOTE_PROC_DOMAIN_OPEN_GRAPHICS_FD, - (xdrproc_t) xdr_remote_domain_open_graphics_fd_args, (char *) &args, - (xdrproc_t) xdr_void, NULL) == -1) + (xdrproc_t)xdr_remote_domain_open_graphics_fd_args, (char *)&args, + (xdrproc_t)xdr_void, NULL) == -1) goto done; if (fdoutlen != 1) { @@ -6585,10 +6585,10 @@ remoteDomainGetDiskErrors(virDomainPtr dom, memset(&ret, 0, sizeof(ret)); if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_DISK_ERRORS, - (xdrproc_t) xdr_remote_domain_get_disk_errors_args, - (char *) &args, - (xdrproc_t) xdr_remote_domain_get_disk_errors_ret, - (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_get_disk_errors_args, + (char *)&args, + (xdrproc_t)xdr_remote_domain_get_disk_errors_ret, + (char *)&ret) == -1) goto done; if (remoteDeserializeDomainDiskErrors(ret.errors.errors_val, @@ -6601,7 +6601,7 @@ remoteDomainGetDiskErrors(virDomainPtr dom, rv = ret.nerrors; cleanup: - xdr_free((xdrproc_t) xdr_remote_domain_get_disk_errors_ret, (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_domain_get_disk_errors_ret, (char *)&ret); done: remoteDriverUnlock(priv); @@ -6697,8 +6697,8 @@ remoteDomainGetInterfaceParameters(virDomainPtr domain, memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_INTERFACE_PARAMETERS, - (xdrproc_t) xdr_remote_domain_get_interface_parameters_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_get_interface_parameters_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_get_interface_parameters_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_get_interface_parameters_ret, (char *)&ret) == -1) goto done; /* Handle the case when the caller does not know the number of parameters @@ -6720,8 +6720,8 @@ remoteDomainGetInterfaceParameters(virDomainPtr domain, rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_remote_domain_get_interface_parameters_ret, - (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_domain_get_interface_parameters_ret, + (char *)&ret); done: remoteDriverUnlock(priv); return rv; @@ -6746,8 +6746,8 @@ remoteNodeGetMemoryParameters(virConnectPtr conn, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_NODE_GET_MEMORY_PARAMETERS, - (xdrproc_t) xdr_remote_node_get_memory_parameters_args, (char *) &args, - (xdrproc_t) xdr_remote_node_get_memory_parameters_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_node_get_memory_parameters_args, (char *)&args, + (xdrproc_t)xdr_remote_node_get_memory_parameters_ret, (char *)&ret) == -1) goto done; /* Handle the case when the caller does not know the number of parameters @@ -6769,8 +6769,8 @@ remoteNodeGetMemoryParameters(virConnectPtr conn, rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_remote_node_get_memory_parameters_ret, - (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_node_get_memory_parameters_ret, + (char *)&ret); done: remoteDriverUnlock(priv); return rv; @@ -6795,10 +6795,10 @@ remoteNodeGetCPUMap(virConnectPtr conn, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_NODE_GET_CPU_MAP, - (xdrproc_t) xdr_remote_node_get_cpu_map_args, - (char *) &args, - (xdrproc_t) xdr_remote_node_get_cpu_map_ret, - (char *) &ret) == -1) + (xdrproc_t)xdr_remote_node_get_cpu_map_args, + (char *)&args, + (xdrproc_t)xdr_remote_node_get_cpu_map_ret, + (char *)&ret) == -1) goto done; if (ret.ret < 0) @@ -6816,7 +6816,7 @@ remoteNodeGetCPUMap(virConnectPtr conn, rv = ret.ret; cleanup: - xdr_free((xdrproc_t) xdr_remote_node_get_cpu_map_ret, (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_node_get_cpu_map_ret, (char *)&ret); done: remoteDriverUnlock(priv); return rv; @@ -6844,8 +6844,8 @@ remoteDomainLxcOpenNamespace(virDomainPtr domain, NULL, 0, fdlist, &nfds, LXC_PROC_DOMAIN_OPEN_NAMESPACE, - (xdrproc_t) xdr_lxc_domain_open_namespace_args, (char *) &args, - (xdrproc_t) xdr_void, NULL) == -1) + (xdrproc_t)xdr_lxc_domain_open_namespace_args, (char *)&args, + (xdrproc_t)xdr_void, NULL) == -1) goto done; rv = nfds; @@ -6874,8 +6874,8 @@ remoteDomainGetJobStats(virDomainPtr domain, memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_JOB_STATS, - (xdrproc_t) xdr_remote_domain_get_job_stats_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_get_job_stats_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_get_job_stats_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_get_job_stats_ret, (char *)&ret) == -1) goto done; *type = ret.type; @@ -6889,8 +6889,8 @@ remoteDomainGetJobStats(virDomainPtr domain, rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_remote_domain_get_job_stats_ret, - (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_domain_get_job_stats_ret, + (char *)&ret); done: remoteDriverUnlock(priv); return rv; @@ -6926,19 +6926,19 @@ remoteDomainMigrateBegin3Params(virDomainPtr domain, } if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &args.params.params_val, + (virTypedParameterRemotePtr *)&args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_begin3_params_args, - (char *) &args); + xdr_free((xdrproc_t)xdr_remote_domain_migrate_begin3_params_args, + (char *)&args); goto cleanup; } if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_BEGIN3_PARAMS, - (xdrproc_t) xdr_remote_domain_migrate_begin3_params_args, - (char *) &args, - (xdrproc_t) xdr_remote_domain_migrate_begin3_params_ret, - (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_migrate_begin3_params_args, + (char *)&args, + (xdrproc_t)xdr_remote_domain_migrate_begin3_params_ret, + (char *)&ret) == -1) goto cleanup; if (ret.cookie_out.cookie_out_len > 0) { @@ -6994,11 +6994,11 @@ remoteDomainMigratePrepare3Params(virConnectPtr dconn, } if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &args.params.params_val, + (virTypedParameterRemotePtr *)&args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_prepare3_params_args, - (char *) &args); + xdr_free((xdrproc_t)xdr_remote_domain_migrate_prepare3_params_args, + (char *)&args); goto cleanup; } @@ -7007,10 +7007,10 @@ remoteDomainMigratePrepare3Params(virConnectPtr dconn, args.flags = flags; if (call(dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE3_PARAMS, - (xdrproc_t) xdr_remote_domain_migrate_prepare3_params_args, - (char *) &args, - (xdrproc_t) xdr_remote_domain_migrate_prepare3_params_ret, - (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_migrate_prepare3_params_args, + (char *)&args, + (xdrproc_t)xdr_remote_domain_migrate_prepare3_params_ret, + (char *)&ret) == -1) goto cleanup; if (ret.cookie_out.cookie_out_len > 0) { @@ -7082,11 +7082,11 @@ remoteDomainMigratePrepareTunnel3Params(virConnectPtr dconn, args.flags = flags; if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &args.params.params_val, + (virTypedParameterRemotePtr *)&args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_prepare_tunnel3_params_args, - (char *) &args); + xdr_free((xdrproc_t)xdr_remote_domain_migrate_prepare_tunnel3_params_args, + (char *)&args); goto cleanup; } @@ -7106,10 +7106,10 @@ remoteDomainMigratePrepareTunnel3Params(virConnectPtr dconn, st->privateData = netst; if (call(dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE_TUNNEL3_PARAMS, - (xdrproc_t) xdr_remote_domain_migrate_prepare_tunnel3_params_args, - (char *) &args, - (xdrproc_t) xdr_remote_domain_migrate_prepare_tunnel3_params_ret, - (char *) &ret) == -1) { + (xdrproc_t)xdr_remote_domain_migrate_prepare_tunnel3_params_args, + (char *)&args, + (xdrproc_t)xdr_remote_domain_migrate_prepare_tunnel3_params_ret, + (char *)&ret) == -1) { virNetClientRemoveStream(priv->client, netst); virObjectUnref(netst); goto cleanup; @@ -7168,25 +7168,25 @@ remoteDomainMigratePerform3Params(virDomainPtr dom, } make_nonnull_domain(&args.dom, dom); - args.dconnuri = dconnuri == NULL ? NULL : (char **) &dconnuri; + args.dconnuri = dconnuri == NULL ? NULL : (char **)&dconnuri; args.cookie_in.cookie_in_val = (char *)cookiein; args.cookie_in.cookie_in_len = cookieinlen; args.flags = flags; if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &args.params.params_val, + (virTypedParameterRemotePtr *)&args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_perform3_params_args, - (char *) &args); + xdr_free((xdrproc_t)xdr_remote_domain_migrate_perform3_params_args, + (char *)&args); goto cleanup; } if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PERFORM3_PARAMS, - (xdrproc_t) xdr_remote_domain_migrate_perform3_params_args, - (char *) &args, - (xdrproc_t) xdr_remote_domain_migrate_perform3_params_ret, - (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_migrate_perform3_params_args, + (char *)&args, + (xdrproc_t)xdr_remote_domain_migrate_perform3_params_ret, + (char *)&ret) == -1) goto cleanup; if (ret.cookie_out.cookie_out_len > 0) { @@ -7247,19 +7247,19 @@ remoteDomainMigrateFinish3Params(virConnectPtr dconn, args.cancelled = cancelled; if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &args.params.params_val, + (virTypedParameterRemotePtr *)&args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_finish3_params_args, - (char *) &args); + xdr_free((xdrproc_t)xdr_remote_domain_migrate_finish3_params_args, + (char *)&args); goto cleanup; } if (call(dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_FINISH3_PARAMS, - (xdrproc_t) xdr_remote_domain_migrate_finish3_params_args, - (char *) &args, - (xdrproc_t) xdr_remote_domain_migrate_finish3_params_ret, - (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_migrate_finish3_params_args, + (char *)&args, + (xdrproc_t)xdr_remote_domain_migrate_finish3_params_ret, + (char *)&ret) == -1) goto cleanup; rv = get_nonnull_domain(dconn, ret.dom); @@ -7276,8 +7276,8 @@ remoteDomainMigrateFinish3Params(virConnectPtr dconn, ret.cookie_out.cookie_out_len = 0; } - xdr_free((xdrproc_t) &xdr_remote_domain_migrate_finish3_params_ret, - (char *) &ret); + xdr_free((xdrproc_t)&xdr_remote_domain_migrate_finish3_params_ret, + (char *)&ret); cleanup: virTypedParamsRemoteFree((virTypedParameterRemotePtr) args.params.params_val, @@ -7317,22 +7317,22 @@ remoteDomainMigrateConfirm3Params(virDomainPtr domain, make_nonnull_domain(&args.dom, domain); args.cookie_in.cookie_in_len = cookieinlen; - args.cookie_in.cookie_in_val = (char *) cookiein; + args.cookie_in.cookie_in_val = (char *)cookiein; args.flags = flags; args.cancelled = cancelled; if (virTypedParamsSerialize(params, nparams, - (virTypedParameterRemotePtr *) &args.params.params_val, + (virTypedParameterRemotePtr *)&args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_confirm3_params_args, - (char *) &args); + xdr_free((xdrproc_t)xdr_remote_domain_migrate_confirm3_params_args, + (char *)&args); goto cleanup; } if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_CONFIRM3_PARAMS, - (xdrproc_t) xdr_remote_domain_migrate_confirm3_params_args, - (char *) &args, (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_remote_domain_migrate_confirm3_params_args, + (char *)&args, (xdrproc_t)xdr_void, (char *) NULL) == -1) goto cleanup; rv = 0; @@ -7406,7 +7406,7 @@ remoteDomainCreateWithFiles(virDomainPtr dom, } dom->id = ret.dom.id; - xdr_free((xdrproc_t) &xdr_remote_domain_create_with_files_ret, (char *) &ret); + xdr_free((xdrproc_t)&xdr_remote_domain_create_with_files_ret, (char *)&ret); rv = 0; done: @@ -7433,13 +7433,13 @@ remoteDomainGetTime(virDomainPtr dom, *seconds = *nseconds = 0; if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_TIME, - (xdrproc_t) xdr_remote_domain_get_time_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_get_time_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_domain_get_time_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_get_time_ret, (char *)&ret) == -1) goto cleanup; *seconds = ret.seconds; *nseconds = ret.nseconds; - xdr_free((xdrproc_t) &xdr_remote_domain_get_time_ret, (char *) &ret); + xdr_free((xdrproc_t)&xdr_remote_domain_get_time_ret, (char *)&ret); rv = 0; cleanup: @@ -7471,7 +7471,7 @@ remoteNodeGetFreePages(virConnectPtr conn, goto done; } - args.pages.pages_val = (u_int *) pages; + args.pages.pages_val = (u_int *)pages; args.pages.pages_len = npages; args.startCell = startCell; args.cellCount = cellCount; @@ -7479,13 +7479,13 @@ remoteNodeGetFreePages(virConnectPtr conn, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_NODE_GET_FREE_PAGES, - (xdrproc_t) xdr_remote_node_get_free_pages_args, (char *)&args, - (xdrproc_t) xdr_remote_node_get_free_pages_ret, (char *)&ret) == -1) + (xdrproc_t)xdr_remote_node_get_free_pages_args, (char *)&args, + (xdrproc_t)xdr_remote_node_get_free_pages_ret, (char *)&ret) == -1) goto done; memcpy(counts, ret.counts.counts_val, ret.counts.counts_len * sizeof(*counts)); - xdr_free((xdrproc_t) xdr_remote_node_get_free_pages_ret, (char *) &ret); + xdr_free((xdrproc_t)xdr_remote_node_get_free_pages_ret, (char *)&ret); rv = ret.counts.counts_len; @@ -7561,7 +7561,7 @@ remoteNetworkGetDHCPLeases(virNetworkPtr net, remoteDriverLock(priv); make_nonnull_network(&args.net, net); - args.mac = mac ? (char **) &mac : NULL; + args.mac = mac ? (char **)&mac : NULL; args.flags = flags; args.need_results = !!leases; @@ -7605,7 +7605,7 @@ remoteNetworkGetDHCPLeases(virNetworkPtr net, VIR_FREE(leases_ret); } xdr_free((xdrproc_t)xdr_remote_network_get_dhcp_leases_ret, - (char *) &ret); + (char *)&ret); done: remoteDriverUnlock(priv); @@ -7698,7 +7698,7 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, virDomainStatsRecordListFree(tmpret); VIR_FREE(args.doms.doms_val); xdr_free((xdrproc_t)xdr_remote_connect_get_all_domain_stats_ret, - (char *) &ret); + (char *)&ret); return rv; } @@ -7727,7 +7727,7 @@ remoteNodeAllocPages(virConnectPtr conn, goto done; } - args.pageSizes.pageSizes_val = (u_int *) pageSizes; + args.pageSizes.pageSizes_val = (u_int *)pageSizes; args.pageSizes.pageSizes_len = npages; args.pageCounts.pageCounts_val = (uint64_t *) pageCounts; args.pageCounts.pageCounts_len = npages; @@ -7737,8 +7737,8 @@ remoteNodeAllocPages(virConnectPtr conn, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_NODE_ALLOC_PAGES, - (xdrproc_t) xdr_remote_node_alloc_pages_args, (char *) &args, - (xdrproc_t) xdr_remote_node_alloc_pages_ret, (char *) &ret) == -1) + (xdrproc_t)xdr_remote_node_alloc_pages_args, (char *)&args, + (xdrproc_t)xdr_remote_node_alloc_pages_ret, (char *)&ret) == -1) goto done; rv = ret.ret; @@ -7833,7 +7833,7 @@ remoteDomainGetFSInfo(virDomainPtr dom, VIR_FREE(info_ret); } xdr_free((xdrproc_t)xdr_remote_domain_get_fsinfo_ret, - (char *) &ret); + (char *)&ret); done: remoteDriverUnlock(priv); @@ -7937,7 +7937,7 @@ remoteDomainInterfaceAddresses(virDomainPtr dom, VIR_FREE(ifaces_ret); } xdr_free((xdrproc_t)xdr_remote_domain_interface_addresses_ret, - (char *) &ret); + (char *)&ret); done: remoteDriverUnlock(priv); return rv; @@ -7962,8 +7962,8 @@ remoteConnectRegisterCloseCallback(virConnectPtr conn, if (priv->serverCloseCallback && call(conn, priv, 0, REMOTE_PROC_CONNECT_REGISTER_CLOSE_CALLBACK, - (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_void, (char *) NULL, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto cleanup; virConnectCloseCallbackDataRegister(priv->closeCallback, conn, cb, @@ -7993,8 +7993,8 @@ remoteConnectUnregisterCloseCallback(virConnectPtr conn, if (priv->serverCloseCallback && call(conn, priv, 0, REMOTE_PROC_CONNECT_UNREGISTER_CLOSE_CALLBACK, - (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_void, (char *) NULL, + (xdrproc_t)xdr_void, (char *) NULL) == -1) goto cleanup; virConnectCloseCallbackDataUnregister(priv->closeCallback, cb); diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 296a0871813a..9a2be544a43b 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -1141,13 +1141,13 @@ struct remote_domain_get_vcpus_flags_ret { struct remote_domain_pin_vcpu_args { remote_nonnull_domain dom; unsigned int vcpu; - opaque cpumap<REMOTE_CPUMAP_MAX>; /* (unsigned char *) */ + opaque cpumap<REMOTE_CPUMAP_MAX>; /* (unsigned char *)*/ }; struct remote_domain_pin_vcpu_flags_args { remote_nonnull_domain dom; unsigned int vcpu; - opaque cpumap<REMOTE_CPUMAP_MAX>; /* (unsigned char *) */ + opaque cpumap<REMOTE_CPUMAP_MAX>; /* (unsigned char *)*/ unsigned int flags; }; @@ -1165,7 +1165,7 @@ struct remote_domain_get_vcpu_pin_info_ret { struct remote_domain_pin_emulator_args { remote_nonnull_domain dom; - opaque cpumap<REMOTE_CPUMAP_MAX>; /* (unsigned char *) */ + opaque cpumap<REMOTE_CPUMAP_MAX>; /* (unsigned char *)*/ unsigned int flags; }; @@ -1217,7 +1217,7 @@ struct remote_domain_get_iothread_info_ret { struct remote_domain_pin_iothread_args { remote_nonnull_domain dom; unsigned int iothreads_id; - opaque cpumap<REMOTE_CPUMAP_MAX>; /* (unsigned char *) */ + opaque cpumap<REMOTE_CPUMAP_MAX>; /* (unsigned char *)*/ unsigned int flags; }; @@ -2167,7 +2167,7 @@ struct remote_secret_get_xml_desc_ret { struct remote_secret_set_value_args { remote_nonnull_secret secret; - opaque value<REMOTE_SECRET_VALUE_MAX>; /* (const unsigned char *) */ + opaque value<REMOTE_SECRET_VALUE_MAX>; /* (const unsigned char *)*/ unsigned int flags; }; @@ -2285,7 +2285,7 @@ struct remote_connect_compare_cpu_ret { struct remote_connect_baseline_cpu_args { - remote_nonnull_string xmlCPUs<REMOTE_CPU_BASELINE_MAX>; /* (const char **) */ + remote_nonnull_string xmlCPUs<REMOTE_CPU_BASELINE_MAX>; /* (const char **)*/ unsigned int flags; }; @@ -3211,7 +3211,7 @@ struct remote_node_device_event_update_msg { struct remote_domain_fsfreeze_args { remote_nonnull_domain dom; - remote_nonnull_string mountpoints<REMOTE_DOMAIN_FSFREEZE_MOUNTPOINTS_MAX>; /* (const char **) */ + remote_nonnull_string mountpoints<REMOTE_DOMAIN_FSFREEZE_MOUNTPOINTS_MAX>; /* (const char **)*/ unsigned int flags; }; @@ -3221,7 +3221,7 @@ struct remote_domain_fsfreeze_ret { struct remote_domain_fsthaw_args { remote_nonnull_domain dom; - remote_nonnull_string mountpoints<REMOTE_DOMAIN_FSFREEZE_MOUNTPOINTS_MAX>; /* (const char **) */ + remote_nonnull_string mountpoints<REMOTE_DOMAIN_FSFREEZE_MOUNTPOINTS_MAX>; /* (const char **)*/ unsigned int flags; }; @@ -3303,7 +3303,7 @@ struct remote_domain_fsinfo { remote_nonnull_string mountpoint; remote_nonnull_string name; remote_nonnull_string fstype; - remote_nonnull_string dev_aliases<REMOTE_DOMAIN_FSINFO_DISKS_MAX>; /* (const char **) */ + remote_nonnull_string dev_aliases<REMOTE_DOMAIN_FSINFO_DISKS_MAX>; /* (const char **)*/ }; struct remote_domain_get_fsinfo_args { -- 2.17.0
On Wed, Apr 25, 2018 at 03:24:52PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/remote/remote_daemon_dispatch.c | 50 +-- src/remote/remote_daemon_stream.c | 2 +- src/remote/remote_driver.c | 620 ++++++++++++++-------------- src/remote/remote_protocol.x | 18 +- 4 files changed, 345 insertions(+), 345 deletions(-)
@@ -1209,8 +1209,8 @@ doRemoteOpen(virConnectPtr conn,
VIR_DEBUG("Trying to open URI %s", name); if (call(conn, priv, 0, REMOTE_PROC_CONNECT_OPEN, - (xdrproc_t) xdr_remote_connect_open_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t)xdr_remote_connect_open_args, (char *)&args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) ^^^^^^^^ This also looks like a cast ;) Jano
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/rpc/virnetclientstream.c | 4 ++-- src/rpc/virnetserverclient.c | 2 +- src/rpc/virnetserverprogram.c | 2 +- src/rpc/virnetsocket.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index 7b8b4e5c89f6..05d76c9b87f8 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -440,7 +440,7 @@ virNetClientStreamHandleHole(virNetClientPtr client, } if (virNetMessageDecodePayload(msg, - (xdrproc_t) xdr_virNetStreamHole, + (xdrproc_t)xdr_virNetStreamHole, &data) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Malformed stream hole packet")); @@ -625,7 +625,7 @@ virNetClientStreamSendHole(virNetClientStreamPtr st, goto cleanup; if (virNetMessageEncodePayload(msg, - (xdrproc_t) xdr_virNetStreamHole, + (xdrproc_t)xdr_virNetStreamHole, &data) < 0) goto cleanup; diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index b373ca1a8b48..f3bc0a48548f 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -472,7 +472,7 @@ virNetServerClientPtr virNetServerClientNew(unsigned long long id, #endif ); - if ((now = time(NULL)) == (time_t) - 1) { + if ((now = time(NULL)) == (time_t)- 1) { virReportSystemError(errno, "%s", _("failed to get current time")); return NULL; } diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index b04c36d3aacb..8d2c34058b53 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -575,7 +575,7 @@ int virNetServerProgramSendStreamHole(virNetServerProgramPtr prog, return -1; if (virNetMessageEncodePayload(msg, - (xdrproc_t) xdr_virNetStreamHole, + (xdrproc_t)xdr_virNetStreamHole, &data) < 0) return -1; diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index f253eb260500..7087abec9c5d 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -231,7 +231,7 @@ static virNetSocketPtr virNetSocketNew(virSocketAddrPtr localAddr, VIR_DEBUG("localAddr=%p remoteAddr=%p fd=%d errfd=%d pid=%lld", localAddr, remoteAddr, - fd, errfd, (long long) pid); + fd, errfd, (long long)pid); if (virSetCloseExec(fd) < 0) { virReportSystemError(errno, "%s", @@ -286,7 +286,7 @@ static virNetSocketPtr virNetSocketNew(virSocketAddrPtr localAddr, PROBE(RPC_SOCKET_NEW, "sock=%p fd=%d errfd=%d pid=%lld localAddr=%s, remoteAddr=%s", - sock, fd, errfd, (long long) pid, + sock, fd, errfd, (long long)pid, NULLSTR(sock->localAddrStrSASL), NULLSTR(sock->remoteAddrStrSASL)); return sock; @@ -486,7 +486,7 @@ int virNetSocketNewListenUNIX(const char *path, if (grp != 0 && chown(path, user, grp)) { virReportSystemError(errno, _("Failed to change ownership of '%s' to %d:%d"), - path, (int) user, (int) grp); + path, (int)user, (int)grp); goto error; } -- 2.17.0
On Wed, Apr 25, 2018 at 03:24:53PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/rpc/virnetclientstream.c | 4 ++-- src/rpc/virnetserverclient.c | 2 +- src/rpc/virnetserverprogram.c | 2 +- src/rpc/virnetsocket.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index b373ca1a8b48..f3bc0a48548f 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -472,7 +472,7 @@ virNetServerClientPtr virNetServerClientNew(unsigned long long id, #endif );
- if ((now = time(NULL)) == (time_t) - 1) { + if ((now = time(NULL)) == (time_t)- 1) {
Please also remove the space between - and 1. Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
virReportSystemError(errno, "%s", _("failed to get current time")); return NULL; }
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/security/security_apparmor.c | 6 ++--- src/security/security_dac.c | 42 ++++++++++++++++---------------- src/security/security_selinux.c | 14 +++++------ src/security/virt-aa-helper.c | 2 +- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 92acc9e27c68..333d098be4fd 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -768,7 +768,7 @@ AppArmorSetInputLabel(virSecurityManagerPtr mgr, if (input == NULL) return 0; - switch ((virDomainInputType) input->type) { + switch ((virDomainInputType)input->type) { case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: if (input->source.evdev == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -928,7 +928,7 @@ AppArmorSetSecurityHostdevLabel(virSecurityManagerPtr mgr, ptr->mgr = mgr; ptr->def = def; - switch ((virDomainHostdevSubsysType) dev->source.subsys.type) { + switch ((virDomainHostdevSubsysType)dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { virUSBDevicePtr usb = virUSBDeviceNew(usbsrc->bus, usbsrc->device, vroot); @@ -1047,7 +1047,7 @@ AppArmorSetChardevLabel(virSecurityManagerPtr mgr, if (!secdef) return 0; - switch ((virDomainChrType) dev_source->type) { + switch ((virDomainChrType)dev_source->type) { case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_FILE: case VIR_DOMAIN_CHR_TYPE_UNIX: diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 663c8c9eaf52..8938e2dd89dd 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -224,8 +224,8 @@ virSecurityDACSetUserAndGroup(virSecurityManagerPtr mgr, priv->group = group; if (virAsprintf(&priv->baselabel, "+%u:+%u", - (unsigned int) user, - (unsigned int) group) < 0) + (unsigned int)user, + (unsigned int)group) < 0) return -1; return 0; @@ -564,7 +564,7 @@ virSecurityDACSetOwnershipInternal(const virSecurityDACData *priv, return 0; VIR_INFO("Setting DAC user and group on '%s' to '%ld:%ld'", - NULLSTR(src ? src->path : path), (long) uid, (long) gid); + NULLSTR(src ? src->path : path), (long)uid, (long)gid); if (priv && src && priv->chownCallback) { rc = priv->chownCallback(src, uid, gid); @@ -604,20 +604,20 @@ virSecurityDACSetOwnershipInternal(const virSecurityDACData *priv, if (errno == EOPNOTSUPP || errno == EINVAL) { VIR_INFO("Setting user and group to '%ld:%ld' on '%s' not " "supported by filesystem", - (long) uid, (long) gid, path); + (long)uid, (long)gid, path); } else if (errno == EPERM) { VIR_INFO("Setting user and group to '%ld:%ld' on '%s' not " "permitted", - (long) uid, (long) gid, path); + (long)uid, (long)gid, path); } else if (errno == EROFS) { VIR_INFO("Setting user and group to '%ld:%ld' on '%s' not " "possible on readonly filesystem", - (long) uid, (long) gid, path); + (long)uid, (long)gid, path); } else { virReportSystemError(errno, _("unable to set user and group to '%ld:%ld' " "on '%s'"), - (long) uid, (long) gid, path); + (long)uid, (long)gid, path); return -1; } } @@ -921,7 +921,7 @@ virSecurityDACSetHostdevLabel(virSecurityManagerPtr mgr, if (cbdata.secdef && !cbdata.secdef->relabel) return 0; - switch ((virDomainHostdevSubsysType) dev->source.subsys.type) { + switch ((virDomainHostdevSubsysType)dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { virUSBDevicePtr usb; @@ -1094,7 +1094,7 @@ virSecurityDACRestoreHostdevLabel(virSecurityManagerPtr mgr, scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) return 0; - switch ((virDomainHostdevSubsysType) dev->source.subsys.type) { + switch ((virDomainHostdevSubsysType)dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { virUSBDevicePtr usb; @@ -1223,7 +1223,7 @@ virSecurityDACSetChardevLabel(virSecurityManagerPtr mgr, return -1; } - switch ((virDomainChrType) dev_source->type) { + switch ((virDomainChrType)dev_source->type) { case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_FILE: ret = virSecurityDACSetOwnership(priv, NULL, @@ -1299,7 +1299,7 @@ virSecurityDACRestoreChardevLabel(virSecurityManagerPtr mgr, chardevStdioLogd) return 0; - switch ((virDomainChrType) dev_source->type) { + switch ((virDomainChrType)dev_source->type) { case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_FILE: ret = virSecurityDACRestoreFileLabel(priv, dev_source->data.file.path); @@ -1465,7 +1465,7 @@ virSecurityDACSetInputLabel(virSecurityManagerPtr mgr, if (seclabel && !seclabel->relabel) return 0; - switch ((virDomainInputType) input->type) { + switch ((virDomainInputType)input->type) { case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: if (virSecurityDACGetIds(seclabel, priv, &user, &group, NULL, NULL) < 0) return -1; @@ -1492,7 +1492,7 @@ virSecurityDACRestoreInputLabel(virSecurityManagerPtr mgr, virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); int ret = -1; - switch ((virDomainInputType) input->type) { + switch ((virDomainInputType)input->type) { case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: ret = virSecurityDACRestoreFileLabel(priv, input->source.evdev); break; @@ -1810,7 +1810,7 @@ virSecurityDACSetProcessLabel(virSecurityManagerPtr mgr, return -1; VIR_DEBUG("Dropping privileges to %u:%u, %d supplemental groups", - (unsigned int) user, (unsigned int) group, ngroups); + (unsigned int)user, (unsigned int)group, ngroups); if (virSetUIDGID(user, group, groups, ngroups) < 0) return -1; @@ -1835,7 +1835,7 @@ virSecurityDACSetChildProcessLabel(virSecurityManagerPtr mgr, return -1; VIR_DEBUG("Setting child to drop privileges to %u:%u", - (unsigned int) user, (unsigned int) group); + (unsigned int)user, (unsigned int)group); virCommandSetUID(cmd, user); virCommandSetGID(cmd, group); @@ -1878,7 +1878,7 @@ virSecurityDACGenLabel(virSecurityManagerPtr mgr, return rc; } - switch ((virDomainSeclabelType) seclabel->type) { + switch ((virDomainSeclabelType)seclabel->type) { case VIR_DOMAIN_SECLABEL_STATIC: if (seclabel->label == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1889,8 +1889,8 @@ virSecurityDACGenLabel(virSecurityManagerPtr mgr, break; case VIR_DOMAIN_SECLABEL_DYNAMIC: if (virAsprintf(&seclabel->label, "+%u:+%u", - (unsigned int) priv->user, - (unsigned int) priv->group) < 0) + (unsigned int)priv->user, + (unsigned int)priv->group) < 0) return rc; if (seclabel->label == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1945,7 +1945,7 @@ virSecurityDACGetProcessLabelInternal(pid_t pid, VIR_DEBUG("Getting DAC user and group on process '%d'", pid); - if (virAsprintf(&path, "/proc/%d", (int) pid) < 0) + if (virAsprintf(&path, "/proc/%d", (int)pid) < 0) goto cleanup; if (lstat(path, &sb) < 0) { @@ -1956,7 +1956,7 @@ virSecurityDACGetProcessLabelInternal(pid_t pid, } snprintf(seclabel->label, VIR_SECURITY_LABEL_BUFLEN, - "+%u:+%u", (unsigned int) sb.st_uid, (unsigned int) sb.st_gid); + "+%u:+%u", (unsigned int)sb.st_uid, (unsigned int)sb.st_gid); ret = 0; cleanup: @@ -1985,7 +1985,7 @@ virSecurityDACGetProcessLabelInternal(pid_t pid, } snprintf(seclabel->label, VIR_SECURITY_LABEL_BUFLEN, - "+%u:+%u", (unsigned int) p.ki_uid, (unsigned int) p.ki_groups[0]); + "+%u:+%u", (unsigned int)p.ki_uid, (unsigned int)p.ki_groups[0]); return 0; } diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index c26cdacd9f45..5f74ef739b2f 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1112,7 +1112,7 @@ virSecuritySELinuxGetProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, return -1; } - if (strlen((char *) ctx) >= VIR_SECURITY_LABEL_BUFLEN) { + if (strlen((char *)ctx) >= VIR_SECURITY_LABEL_BUFLEN) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label exceeds " "maximum length: %d"), @@ -1121,7 +1121,7 @@ virSecuritySELinuxGetProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, return -1; } - strcpy(sec->label, (char *) ctx); + strcpy(sec->label, (char *)ctx); freecon(ctx); VIR_DEBUG("label=%s", sec->label); @@ -1155,7 +1155,7 @@ virSecuritySELinuxSetFileconHelper(const char *path, const char *tcon, VIR_INFO("Setting SELinux context on '%s' to '%s'", path, tcon); - if (setfilecon_raw(path, (VIR_SELINUX_CTX_CONST char *) tcon) < 0) { + if (setfilecon_raw(path, (VIR_SELINUX_CTX_CONST char *)tcon) < 0) { int setfilecon_errno = errno; if (getfilecon_raw(path, &econ) >= 0) { @@ -1336,7 +1336,7 @@ virSecuritySELinuxSetInputLabel(virSecurityManagerPtr mgr, if (seclabel == NULL) return 0; - switch ((virDomainInputType) input->type) { + switch ((virDomainInputType)input->type) { case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: if (virSecuritySELinuxSetFilecon(mgr, input->source.evdev, seclabel->imagelabel) < 0) @@ -1366,7 +1366,7 @@ virSecuritySELinuxRestoreInputLabel(virSecurityManagerPtr mgr, if (seclabel == NULL) return 0; - switch ((virDomainInputType) input->type) { + switch ((virDomainInputType)input->type) { case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: rc = virSecuritySELinuxRestoreFileLabel(mgr, input->source.evdev); break; @@ -1772,7 +1772,7 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityManagerPtr mgr, scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) return 0; - switch ((virDomainHostdevSubsysType) dev->source.subsys.type) { + switch ((virDomainHostdevSubsysType)dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { virUSBDevicePtr usb; @@ -2014,7 +2014,7 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecurityManagerPtr mgr, scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) return 0; - switch ((virDomainHostdevSubsysType) dev->source.subsys.type) { + switch ((virDomainHostdevSubsysType)dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { virUSBDevicePtr usb; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index ee5e3b0701d6..d0f9876da56f 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1276,7 +1276,7 @@ vahParseArgv(vahControl * ctl, int argc, char **argv) case 'u': if (strlen(optarg) > PROFILE_NAME_SIZE - 1) vah_error(ctl, 1, _("invalid UUID")); - if (virStrcpy((char *) ctl->uuid, optarg, + if (virStrcpy((char *)ctl->uuid, optarg, PROFILE_NAME_SIZE) == NULL) vah_error(ctl, 1, _("error copying UUID")); break; -- 2.17.0
On Wed, Apr 25, 2018 at 03:24:54PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/security/security_apparmor.c | 6 ++--- src/security/security_dac.c | 42 ++++++++++++++++---------------- src/security/security_selinux.c | 14 +++++------ src/security/virt-aa-helper.c | 2 +- 4 files changed, 32 insertions(+), 32 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_gluster.c | 6 ++-- src/storage/storage_backend_logical.c | 2 +- src/storage/storage_backend_vstorage.c | 6 ++-- src/storage/storage_driver.c | 6 ++-- src/storage/storage_util.c | 44 +++++++++++++------------- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 9b0fcf92c5cd..e10c497bf201 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -798,7 +798,7 @@ virStorageFileBackendFileRead(virStorageSourcePtr src, } if (offset > 0) { - if (lseek(fd, offset, SEEK_SET) == (off_t) -1) { + if (lseek(fd, offset, SEEK_SET) == (off_t)-1) { virReportSystemError(errno, _("cannot seek into '%s'"), src->path); goto cleanup; } diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index c6cc531e2ff6..fe29e026add8 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -350,7 +350,7 @@ virStorageBackendGlusterRefreshPool(virStoragePoolObjPtr pool) struct { struct dirent ent; /* See comment below about readdir_r needing padding */ - char padding[MAX(1, 256 - (int) (sizeof(struct dirent) + char padding[MAX(1, 256 - (int)(sizeof(struct dirent) - offsetof(struct dirent, d_name)))]; } de; struct dirent *ent; @@ -431,7 +431,7 @@ virStorageBackendGlusterVolDelete(virStoragePoolObjPtr pool, virCheckFlags(0, -1); - switch ((virStorageVolType) vol->type) { + switch ((virStorageVolType)vol->type) { case VIR_STORAGE_VOL_FILE: case VIR_STORAGE_VOL_DIR: case VIR_STORAGE_VOL_BLOCK: @@ -731,7 +731,7 @@ virStorageFileBackendGlusterRead(virStorageSourcePtr src, } if (offset > 0) { - if (glfs_lseek(fd, offset, SEEK_SET) == (off_t) -1) { + if (glfs_lseek(fd, offset, SEEK_SET) == (off_t)-1) { virReportSystemError(errno, _("cannot seek into '%s'"), src->path); goto cleanup; } diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 6a7d59bd57e0..edd4971f1f1f 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -1005,7 +1005,7 @@ virStorageBackendLogicalCreateVol(virStoragePoolObjPtr pool, goto error; } } - if (fchmod(fd, (vol->target.perms->mode == (mode_t) -1 ? + if (fchmod(fd, (vol->target.perms->mode == (mode_t)-1 ? VIR_STORAGE_DEFAULT_VOL_PERM_MODE : vol->target.perms->mode)) < 0) { virReportSystemError(errno, diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_backend_vstorage.c index 076617aeb634..fcaebf29e7c6 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -45,11 +45,11 @@ virStorageBackendVzPoolStart(virStoragePoolObjPtr pool) char *mode = NULL; /* Check the permissions */ - if (def->target.perms.mode == (mode_t) - 1) + if (def->target.perms.mode == (mode_t)- 1) def->target.perms.mode = VIR_STORAGE_DEFAULT_POOL_PERM_MODE; - if (def->target.perms.uid == (uid_t) -1) + if (def->target.perms.uid == (uid_t)-1) def->target.perms.uid = geteuid(); - if (def->target.perms.gid == (gid_t) -1) + if (def->target.perms.gid == (gid_t)-1) def->target.perms.gid = getegid(); /* Convert ids to names because vstorage uses names */ diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 610427673076..b125e2caf916 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1513,7 +1513,7 @@ static bool storageVolLookupByKeyCallback(virStoragePoolObjPtr obj, const void *opaque) { - struct storageVolLookupData *data = (struct storageVolLookupData *) opaque; + struct storageVolLookupData *data = (struct storageVolLookupData *)opaque; if (virStoragePoolObjIsActive(obj)) data->voldef = virStorageVolDefFindByKey(obj, data->key); @@ -1556,7 +1556,7 @@ static bool storageVolLookupByPathCallback(virStoragePoolObjPtr obj, const void *opaque) { - struct storageVolLookupData *data = (struct storageVolLookupData *) opaque; + struct storageVolLookupData *data = (struct storageVolLookupData *)opaque; virStoragePoolDefPtr def; char *stable_path = NULL; @@ -1565,7 +1565,7 @@ storageVolLookupByPathCallback(virStoragePoolObjPtr obj, def = virStoragePoolObjGetDef(obj); - switch ((virStoragePoolType) def->type) { + switch ((virStoragePoolType)def->type) { case VIR_STORAGE_POOL_DIR: case VIR_STORAGE_POOL_FS: case VIR_STORAGE_POOL_NETFS: diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 897dfdaaee4d..03f03b407e13 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -271,19 +271,19 @@ storageBackendCreateBlockFrom(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, goto cleanup; } uid = (vol->target.perms->uid != st.st_uid) ? vol->target.perms->uid - : (uid_t) -1; + : (uid_t)-1; gid = (vol->target.perms->gid != st.st_gid) ? vol->target.perms->gid - : (gid_t) -1; - if (((uid != (uid_t) -1) || (gid != (gid_t) -1)) + : (gid_t)-1; + if (((uid != (uid_t)-1) || (gid != (gid_t)-1)) && (fchown(fd, uid, gid) < 0)) { virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), - vol->target.path, (unsigned int) uid, - (unsigned int) gid); + vol->target.path, (unsigned int)uid, + (unsigned int)gid); goto cleanup; } - mode = (vol->target.perms->mode == (mode_t) -1 ? + mode = (vol->target.perms->mode == (mode_t)-1 ? VIR_STORAGE_DEFAULT_VOL_PERM_MODE : vol->target.perms->mode); if (fchmod(fd, mode) < 0) { virReportSystemError(errno, @@ -433,7 +433,7 @@ storageBackendCreateRaw(virStoragePoolObjPtr pool, if (def->type == VIR_STORAGE_POOL_NETFS) operation_flags |= VIR_FILE_OPEN_FORK; - if (vol->target.perms->mode != (mode_t) -1) + if (vol->target.perms->mode != (mode_t)-1) open_mode = vol->target.perms->mode; if ((fd = virFileOpenAs(vol->target.path, @@ -595,7 +595,7 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool, struct stat st; gid_t gid; uid_t uid; - mode_t mode = (vol->target.perms->mode == (mode_t) -1 ? + mode_t mode = (vol->target.perms->mode == (mode_t)-1 ? VIR_STORAGE_DEFAULT_VOL_PERM_MODE : vol->target.perms->mode); bool filecreated = false; @@ -603,9 +603,9 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool, if ((def->type == VIR_STORAGE_POOL_NETFS) && (((geteuid() == 0) - && (vol->target.perms->uid != (uid_t) -1) + && (vol->target.perms->uid != (uid_t)-1) && (vol->target.perms->uid != 0)) - || ((vol->target.perms->gid != (gid_t) -1) + || ((vol->target.perms->gid != (gid_t)-1) && (vol->target.perms->gid != getegid())))) { virCommandSetUID(cmd, vol->target.perms->uid); @@ -656,15 +656,15 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool, } uid = (vol->target.perms->uid != st.st_uid) ? vol->target.perms->uid - : (uid_t) -1; + : (uid_t)-1; gid = (vol->target.perms->gid != st.st_gid) ? vol->target.perms->gid - : (gid_t) -1; - if (((uid != (uid_t) -1) || (gid != (gid_t) -1)) + : (gid_t)-1; + if (((uid != (uid_t)-1) || (gid != (gid_t)-1)) && (chown(vol->target.path, uid, gid) < 0)) { virReportSystemError(errno, _("cannot chown %s to (%u, %u)"), - vol->target.path, (unsigned int) uid, - (unsigned int) gid); + vol->target.path, (unsigned int)uid, + (unsigned int)gid); goto cleanup; } @@ -730,7 +730,7 @@ storageBackendCreatePloop(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, if (!inputvol) { if ((virDirCreate(vol->target.path, - (vol->target.perms->mode == (mode_t) -1 ? + (vol->target.perms->mode == (mode_t)-1 ? VIR_STORAGE_DEFAULT_VOL_PERM_MODE: vol->target.perms->mode), vol->target.perms->uid, @@ -1354,8 +1354,8 @@ storageBackendCreateQemuImgSecretPath(virStoragePoolObjPtr pool, } VIR_FORCE_CLOSE(fd); - if ((vol->target.perms->uid != (uid_t) -1) && - (vol->target.perms->gid != (gid_t) -1)) { + if ((vol->target.perms->uid != (uid_t)-1) && + (vol->target.perms->gid != (gid_t)-1)) { if (chown(secretPath, vol->target.perms->uid, vol->target.perms->gid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2105,7 +2105,7 @@ createFileDir(virStoragePoolObjPtr pool, if ((err = virDirCreate(vol->target.path, - (vol->target.perms->mode == (mode_t) -1 ? + (vol->target.perms->mode == (mode_t)-1 ? VIR_STORAGE_DEFAULT_VOL_PERM_MODE : vol->target.perms->mode), vol->target.perms->uid, @@ -2236,7 +2236,7 @@ virStorageBackendVolDeleteLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, { virCheckFlags(0, -1); - switch ((virStorageVolType) vol->type) { + switch ((virStorageVolType)vol->type) { case VIR_STORAGE_VOL_FILE: case VIR_STORAGE_VOL_DIR: if (virFileRemove(vol->target.path, vol->target.perms->uid, @@ -2660,7 +2660,7 @@ storageBackendWipeLocal(const char *path, } } - VIR_DEBUG("wiping start: %zd len: %llu", (ssize_t) size, wipe_len); + VIR_DEBUG("wiping start: %zd len: %llu", (ssize_t)size, wipe_len); remaining = wipe_len; while (remaining > 0) { @@ -2912,7 +2912,7 @@ virStorageBackendBuildLocal(virStoragePoolObjPtr pool) needs_create_as_uid = (def->type == VIR_STORAGE_POOL_NETFS); mode = def->target.perms.mode; - if (mode == (mode_t) -1 && + if (mode == (mode_t)-1 && (needs_create_as_uid || !virFileExists(def->target.path))) mode = VIR_STORAGE_DEFAULT_POOL_PERM_MODE; if (needs_create_as_uid) -- 2.17.0
On Wed, Apr 25, 2018 at 03:24:55PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_gluster.c | 6 ++-- src/storage/storage_backend_logical.c | 2 +- src/storage/storage_backend_vstorage.c | 6 ++-- src/storage/storage_driver.c | 6 ++-- src/storage/storage_util.c | 44 +++++++++++++------------- 6 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_backend_vstorage.c index 076617aeb634..fcaebf29e7c6 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -45,11 +45,11 @@ virStorageBackendVzPoolStart(virStoragePoolObjPtr pool) char *mode = NULL;
/* Check the permissions */ - if (def->target.perms.mode == (mode_t) - 1)
Same here.
+ if (def->target.perms.mode == (mode_t)- 1) def->target.perms.mode = VIR_STORAGE_DEFAULT_POOL_PERM_MODE; - if (def->target.perms.uid == (uid_t) -1) + if (def->target.perms.uid == (uid_t)-1) def->target.perms.uid = geteuid(); - if (def->target.perms.gid == (gid_t) -1) + if (def->target.perms.gid == (gid_t)-1) def->target.perms.gid = getegid();
/* Convert ids to names because vstorage uses names */
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/test/test_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index a1888c0c9fe5..4d844625e655 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5005,7 +5005,7 @@ static bool testStorageVolLookupByKeyCallback(virStoragePoolObjPtr obj, const void *opaque) { - struct storageVolLookupData *data = (struct storageVolLookupData *) opaque; + struct storageVolLookupData *data = (struct storageVolLookupData *)opaque; if (virStoragePoolObjIsActive(obj)) data->voldef = virStorageVolDefFindByKey(obj, data->key); @@ -5049,7 +5049,7 @@ static bool testStorageVolLookupByPathCallback(virStoragePoolObjPtr obj, const void *opaque) { - struct storageVolLookupData *data = (struct storageVolLookupData *) opaque; + struct storageVolLookupData *data = (struct storageVolLookupData *)opaque; if (virStoragePoolObjIsActive(obj)) data->voldef = virStorageVolDefFindByPath(obj, data->path); -- 2.17.0
On Wed, Apr 25, 2018 at 03:24:56PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/test/test_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/uml/uml_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index b50ba1ba64ab..b0774b288e97 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1338,7 +1338,7 @@ static int umlGetProcessInfo(unsigned long long *cpuTime, pid_t pid) FILE *pidinfo; unsigned long long usertime, systime; - if (virAsprintf(&proc, "/proc/%lld/stat", (long long) pid) < 0) + if (virAsprintf(&proc, "/proc/%lld/stat", (long long)pid) < 0) return -1; if (!(pidinfo = fopen(proc, "r"))) { @@ -2434,8 +2434,8 @@ umlDomainBlockPeek(virDomainPtr dom, /* NB. Because we configure with AC_SYS_LARGEFILE, off_t should * be 64 bits on all platforms. */ - if (lseek(fd, offset, SEEK_SET) == (off_t) -1 || - saferead(fd, buffer, size) == (ssize_t) -1) { + if (lseek(fd, offset, SEEK_SET) == (off_t)-1 || + saferead(fd, buffer, size) == (ssize_t)-1) { virReportSystemError(errno, _("cannot read %s"), path); goto cleanup; -- 2.17.0
On Wed, Apr 25, 2018 at 03:24:57PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/uml/uml_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/util/iohelper.c | 2 +- src/util/viralloc.h | 12 +++++----- src/util/virarptable.c | 2 +- src/util/viratomic.h | 14 ++++++------ src/util/virbitmap.c | 4 ++-- src/util/virbuffer.c | 2 +- src/util/vircgroup.c | 10 ++++----- src/util/vircommand.c | 4 ++-- src/util/virdnsmasq.c | 2 +- src/util/virfdstream.c | 6 ++--- src/util/virfile.c | 46 +++++++++++++++++++-------------------- src/util/virfirmware.c | 4 ++-- src/util/virhostcpu.c | 2 +- src/util/virhostmem.c | 8 +++---- src/util/viridentity.c | 2 +- src/util/virjson.c | 4 ++-- src/util/virlog.c | 8 +++---- src/util/virmacaddr.c | 2 +- src/util/virmacmap.c | 2 +- src/util/virnetdev.c | 4 ++-- src/util/virnetdevtap.c | 2 +- src/util/virobject.c | 2 +- src/util/virpidfile.c | 6 ++--- src/util/virpolkit.c | 4 ++-- src/util/virprocess.c | 26 +++++++++++----------- src/util/virresctrl.c | 4 ++-- src/util/virsexpr.c | 8 +++---- src/util/virstoragefile.c | 8 +++---- src/util/virstring.c | 14 ++++++------ src/util/virsysinfo.c | 2 +- src/util/virsystemd.c | 4 ++-- src/util/virthreadjob.c | 4 ++-- src/util/virthreadpool.c | 4 ++-- src/util/virtime.c | 4 ++-- src/util/virutil.c | 26 +++++++++++----------- src/util/virutil.h | 6 ++--- src/util/virxml.c | 30 ++++++++++++------------- 37 files changed, 147 insertions(+), 147 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index bb8a8dde694a..569366a32622 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -67,7 +67,7 @@ runIO(const char *path, int fd, int oflags) if (VIR_ALLOC_N(buf, buflen + alignMask) < 0) goto cleanup; base = buf; - buf = (char *) (((intptr_t) base + alignMask) & ~alignMask); + buf = (char *)(((intptr_t)base + alignMask) & ~alignMask); #endif switch (oflags & O_ACCMODE) { diff --git a/src/util/viralloc.h b/src/util/viralloc.h index 69d0f904f1e4..827cbcf93f93 100644 --- a/src/util/viralloc.h +++ b/src/util/viralloc.h @@ -35,12 +35,12 @@ calculations, so the conservative dividend to use here is SIZE_MAX - 1, since SIZE_MAX might represent an overflowed value. However, malloc (SIZE_MAX) fails on all known hosts where - sizeof(ptrdiff_t) <= sizeof(size_t), so do not bother to test for + sizeof(ptrdiff_t)<= sizeof(size_t), so do not bother to test for exactly-SIZE_MAX allocations on such hosts; this avoids a test and branch when S is known to be 1. */ # ifndef xalloc_oversized # define xalloc_oversized(n, s) \ - ((size_t) (sizeof(ptrdiff_t) <= sizeof(size_t) ? -1 : -2) / (s) < (n)) + ((size_t)(sizeof(ptrdiff_t)<= sizeof(size_t)? -1 : -2) / (s) < (n)) # endif @@ -551,7 +551,7 @@ void virDispose(void *ptrptr, size_t count, size_t element_size, size_t *countpt * integer type, all while evaluating ptr only once. This gives us * extra compiler safety when compiling under gcc. */ -# define VIR_FREE(ptr) virFree(1 ? (void *) &(ptr) : (ptr)) +# define VIR_FREE(ptr) virFree(1 ? (void *)&(ptr) : (ptr)) /** @@ -564,7 +564,7 @@ void virDispose(void *ptrptr, size_t count, size_t element_size, size_t *countpt * * This macro is safe to use on arguments with side effects. */ -# define VIR_DISPOSE_N(ptr, count) virDispose(1 ? (void *) &(ptr) : (ptr), 0, \ +# define VIR_DISPOSE_N(ptr, count) virDispose(1 ? (void *)&(ptr) : (ptr), 0, \ sizeof(*(ptr)), &(count)) @@ -576,7 +576,7 @@ void virDispose(void *ptrptr, size_t count, size_t element_size, size_t *countpt * * This macro is not safe to be used on arguments with side effects. */ -# define VIR_DISPOSE_STRING(ptr) virDispose(1 ? (void *) &(ptr) : (ptr), \ +# define VIR_DISPOSE_STRING(ptr) virDispose(1 ? (void *)&(ptr) : (ptr), \ (ptr) ? strlen((ptr)) : 0, 1, NULL) @@ -588,7 +588,7 @@ void virDispose(void *ptrptr, size_t count, size_t element_size, size_t *countpt * * This macro is safe to be used on arguments with side effects. */ -# define VIR_DISPOSE(ptr) virDispose(1 ? (void *) &(ptr) : (ptr), 1, \ +# define VIR_DISPOSE(ptr) virDispose(1 ? (void *)&(ptr) : (ptr), 1, \ sizeof(*(ptr)), NULL) diff --git a/src/util/virarptable.c b/src/util/virarptable.c index c0e90dc4bbf6..8bb7467f6563 100644 --- a/src/util/virarptable.c +++ b/src/util/virarptable.c @@ -51,7 +51,7 @@ VIR_LOG_INIT("util.arptable"); static int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len) { - memset(tb, 0, sizeof(struct rtattr *) * (max + 1)); + memset(tb, 0, sizeof(struct rtattr *)* (max + 1)); VIR_WARNINGS_NO_CAST_ALIGN for (; RTA_OK(rta, len); rta = RTA_NEXT(rta, len)) { VIR_WARNINGS_RESET diff --git a/src/util/viratomic.h b/src/util/viratomic.h index febe401f7704..54fb85e6848e 100644 --- a/src/util/viratomic.h +++ b/src/util/viratomic.h @@ -193,25 +193,25 @@ VIR_STATIC unsigned int virAtomicIntXor(volatile unsigned int *atomic, (__extension__ ({ \ (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ (void)(0 ? *(atomic) ^ (val) : 0); \ - (int) __sync_fetch_and_add((atomic), (val)); \ + (int)__sync_fetch_and_add((atomic), (val)); \ })) # define virAtomicIntAnd(atomic, val) \ (__extension__ ({ \ (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ - (void) (0 ? *(atomic) ^ (val) : 0); \ - (unsigned int) __sync_fetch_and_and((atomic), (val)); \ + (void)(0 ? *(atomic) ^ (val) : 0); \ + (unsigned int)__sync_fetch_and_and((atomic), (val)); \ })) # define virAtomicIntOr(atomic, val) \ (__extension__ ({ \ (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ - (void) (0 ? *(atomic) ^ (val) : 0); \ - (unsigned int) __sync_fetch_and_or((atomic), (val)); \ + (void)(0 ? *(atomic) ^ (val) : 0); \ + (unsigned int)__sync_fetch_and_or((atomic), (val)); \ })) # define virAtomicIntXor(atomic, val) \ (__extension__ ({ \ (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ - (void) (0 ? *(atomic) ^ (val) : 0); \ - (unsigned int) __sync_fetch_and_xor((atomic), (val)); \ + (void)(0 ? *(atomic) ^ (val) : 0); \ + (unsigned int)__sync_fetch_and_xor((atomic), (val)); \ })) diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 0cc5292d8c4e..5aa9a75dcfcf 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -53,7 +53,7 @@ struct _virBitmap { }; -#define VIR_BITMAP_BITS_PER_UNIT ((int) sizeof(unsigned long) * CHAR_BIT) +#define VIR_BITMAP_BITS_PER_UNIT ((int)sizeof(unsigned long)* CHAR_BIT) #define VIR_BITMAP_UNIT_OFFSET(b) ((b) / VIR_BITMAP_BITS_PER_UNIT) #define VIR_BITMAP_BIT_OFFSET(b) ((b) % VIR_BITMAP_BITS_PER_UNIT) #define VIR_BITMAP_BIT(b) (1UL << VIR_BITMAP_BIT_OFFSET(b)) @@ -777,7 +777,7 @@ virBitmapNewData(const void *data, j = 0; p++; } - *p |= (unsigned long) bytes[i] << (j * CHAR_BIT); + *p |= (unsigned long)bytes[i] << (j * CHAR_BIT); } return bitmap; diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c index 3d6defb73a6f..6cc3f6cc27e6 100644 --- a/src/util/virbuffer.c +++ b/src/util/virbuffer.c @@ -781,7 +781,7 @@ virBufferURIEncodeString(virBufferPtr buf, const char *str) if (c_isalnum(*p)) { buf->content[buf->use++] = *p; } else { - uc = (unsigned char) *p; + uc = (unsigned char)*p; buf->content[buf->use++] = '%'; buf->content[buf->use++] = hex[uc >> 4]; buf->content[buf->use++] = hex[uc & 0xf]; diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 0a31947b0d54..32269993ef6e 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -550,13 +550,13 @@ virCgroupDetectPlacement(virCgroupPtr group, char *procfile; VIR_DEBUG("Detecting placement for pid %lld path %s", - (long long) pid, path); + (long long)pid, path); if (pid == -1) { if (VIR_STRDUP(procfile, "/proc/self/cgroup") < 0) goto cleanup; } else { if (virAsprintf(&procfile, "/proc/%lld/cgroup", - (long long) pid) < 0) + (long long)pid) < 0) goto cleanup; } @@ -744,7 +744,7 @@ virCgroupDetect(virCgroupPtr group, virCgroupControllerTypeToString(i), group->controllers[i].mountPoint, group->controllers[i].placement, - (long long) pid); + (long long)pid); } return 0; @@ -1155,7 +1155,7 @@ virCgroupNew(pid_t pid, virCgroupPtr *group) { VIR_DEBUG("pid=%lld path=%s parent=%p controllers=%d group=%p", - (long long) pid, path, parent, controllers, group); + (long long)pid, path, parent, controllers, group); *group = NULL; if (VIR_ALLOC((*group)) < 0) @@ -2581,7 +2581,7 @@ virCgroupGetMemoryUsage(virCgroupPtr group, unsigned long *kb) VIR_CGROUP_CONTROLLER_MEMORY, "memory.usage_in_bytes", &usage_in_bytes); if (ret == 0) - *kb = (unsigned long) usage_in_bytes >> 10; + *kb = (unsigned long)usage_in_bytes >> 10; return ret; } diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 6dab105f568d..889d578c00bc 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -2320,7 +2320,7 @@ virCommandRun(virCommandPtr cmd, int *exitstatus) ret = -1; str = (exitstatus ? virProcessTranslateStatus(*exitstatus) - : (char *) "status 0"); + : (char *)"status 0"); VIR_DEBUG("Result %s, stdout: '%s' stderr: '%s'", NULLSTR(str), cmd->outbuf ? NULLSTR(*cmd->outbuf) : "(null)", @@ -2428,7 +2428,7 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid) if (cmd->pid != -1) { virReportError(VIR_ERR_INTERNAL_ERROR, _("command is already running as pid %lld"), - (long long) cmd->pid); + (long long)cmd->pid); goto cleanup; } diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 492dcadc96a9..5d56bb5feff5 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -700,7 +700,7 @@ dnsmasqCapsSetFromBuffer(dnsmasqCapsPtr caps, const char *buf) p = strchrnul(buf, '\n'); virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse %s version number in '%.*s'"), - caps->binaryPath, (int) (p - buf), buf); + caps->binaryPath, (int)(p - buf), buf); return -1; } diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index e4973a2bd015..681b1b61db70 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -461,7 +461,7 @@ virFDStreamThreadDoRead(virFDStreamDataPtr fdst, /* HACK: The message queue is one directional. So caller * cannot make us skip the hole. Do that for them instead. */ if (sectionLen && - lseek(fdin, sectionLen, SEEK_CUR) == (off_t) -1) { + lseek(fdin, sectionLen, SEEK_CUR) == (off_t)-1) { virReportSystemError(errno, _("unable to seek in %s"), fdinname); @@ -541,7 +541,7 @@ virFDStreamThreadDoWrite(virFDStreamDataPtr fdst, got = msg->stream.hole.len; off = lseek(fdout, got, SEEK_CUR); - if (off == (off_t) -1) { + if (off == (off_t)-1) { virReportSystemError(errno, _("unable to seek in %s"), fdoutname); @@ -1001,7 +1001,7 @@ virFDStreamSendHole(virStreamPtr st, } } else { off = lseek(fdst->fd, length, SEEK_CUR); - if (off == (off_t) -1) { + if (off == (off_t)-1) { virReportSystemError(errno, "%s", _("unable to seek")); goto cleanup; diff --git a/src/util/virfile.c b/src/util/virfile.c index e12a584ca1c5..fb38c437ce70 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2153,8 +2153,8 @@ virFileOpenForceOwnerMode(const char *path, int fd, mode_t mode, ret = -errno; virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), - path, (unsigned int) uid, - (unsigned int) gid); + path, (unsigned int)uid, + (unsigned int)gid); return ret; } if ((flags & VIR_FILE_OPEN_FORCE_MODE) && @@ -2360,9 +2360,9 @@ virFileOpenAs(const char *path, int openflags, mode_t mode, bool created = false; /* allow using -1 to mean "current value" */ - if (uid == (uid_t) -1) + if (uid == (uid_t)-1) uid = geteuid(); - if (gid == (gid_t) -1) + if (gid == (gid_t)-1) gid = getegid(); /* treat absence of both flags as presence of both for simpler @@ -2447,7 +2447,7 @@ virFileRemoveNeedsSetuid(const char *path, uid_t uid, gid_t gid) return false; /* uid/gid weren't specified */ - if ((uid == (uid_t) -1) && (gid == (gid_t) -1)) + if ((uid == (uid_t)-1) && (gid == (gid_t)-1)) return false; /* already running as proper uid/gid */ @@ -2496,9 +2496,9 @@ virFileRemove(const char *path, * to run under the uid/gid that created the volume in order to * perform the unlink of the volume. */ - if (uid == (uid_t) -1) + if (uid == (uid_t)-1) uid = geteuid(); - if (gid == (gid_t) -1) + if (gid == (gid_t)-1) gid = getegid(); ngroups = virGetGroupList(uid, gid, &groups); @@ -2599,15 +2599,15 @@ virDirCreateNoFork(const char *path, virReportSystemError(errno, _("stat of '%s' failed"), path); goto error; } - if (((uid != (uid_t) -1 && st.st_uid != uid) || - (gid != (gid_t) -1 && st.st_gid != gid)) + if (((uid != (uid_t)-1 && st.st_uid != uid) || + (gid != (gid_t)-1 && st.st_gid != gid)) && (chown(path, uid, gid) < 0)) { ret = -errno; virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), - path, (unsigned int) uid, (unsigned int) gid); + path, (unsigned int)uid, (unsigned int)gid); goto error; } - if (mode != (mode_t) -1 && chmod(path, mode) < 0) { + if (mode != (mode_t)-1 && chmod(path, mode) < 0) { ret = -errno; virReportSystemError(errno, _("cannot set mode of '%s' to %04o"), @@ -2667,14 +2667,14 @@ virDirCreate(const char *path, */ if ((!(flags & VIR_DIR_CREATE_AS_UID)) || (geteuid() != 0) - || ((uid == (uid_t) -1) && (gid == (gid_t) -1)) + || ((uid == (uid_t)-1) && (gid == (gid_t)-1)) || ((flags & VIR_DIR_CREATE_ALLOW_EXIST) && virFileExists(path))) { return virDirCreateNoFork(path, mode, uid, gid, flags); } - if (uid == (uid_t) -1) + if (uid == (uid_t)-1) uid = geteuid(); - if (gid == (gid_t) -1) + if (gid == (gid_t)-1) gid = getegid(); ngroups = virGetGroupList(uid, gid, &groups); @@ -2748,15 +2748,15 @@ virDirCreate(const char *path, goto childerror; } - if ((st.st_gid != gid) && (chown(path, (uid_t) -1, gid) < 0)) { + if ((st.st_gid != gid) && (chown(path, (uid_t)-1, gid) < 0)) { ret = errno; virReportSystemError(errno, _("cannot chown '%s' to group %u"), - path, (unsigned int) gid); + path, (unsigned int)gid); goto childerror; } - if (mode != (mode_t) -1 && chmod(path, mode) < 0) { + if (mode != (mode_t)-1 && chmod(path, mode) < 0) { virReportSystemError(errno, _("cannot set mode of '%s' to %04o"), path, mode); @@ -3869,7 +3869,7 @@ virFileInData(int fd, /* Get current position */ cur = lseek(fd, 0, SEEK_CUR); - if (cur == (off_t) -1) { + if (cur == (off_t)-1) { virReportSystemError(errno, "%s", _("Unable to get current position in file")); goto cleanup; @@ -3885,7 +3885,7 @@ virFileInData(int fd, * 4) data < 0, errno != ENXIO; we learned nothing */ - if (data == (off_t) -1) { + if (data == (off_t)-1) { /* cases 3 and 4 */ if (errno != ENXIO) { virReportSystemError(errno, "%s", @@ -3898,7 +3898,7 @@ virFileInData(int fd, * implicit hole at EOF. However, there might be a * trailing hole just before EOF too. If that's the case * report it. */ - if ((end = lseek(fd, 0, SEEK_END)) == (off_t) -1) { + if ((end = lseek(fd, 0, SEEK_END)) == (off_t)-1) { virReportSystemError(errno, "%s", _("Unable to seek to EOF")); goto cleanup; @@ -3916,7 +3916,7 @@ virFileInData(int fd, * find out. Here we get the same 4 possibilities as * described above.*/ hole = lseek(fd, data, SEEK_HOLE); - if (hole == (off_t) -1 || hole == data) { + if (hole == (off_t)-1 || hole == data) { /* cases 1, 3 and 4 */ /* Wait a second. The reason why we are here is * because we are in data. But at the same time we @@ -3934,8 +3934,8 @@ virFileInData(int fd, ret = 0; cleanup: /* At any rate, reposition back to where we started. */ - if (cur != (off_t) -1 && - lseek(fd, cur, SEEK_SET) == (off_t) -1) { + if (cur != (off_t)-1 && + lseek(fd, cur, SEEK_SET) == (off_t)-1) { virReportSystemError(errno, "%s", _("unable to restore position in file")); ret = -1; diff --git a/src/util/virfirmware.c b/src/util/virfirmware.c index 86f8b684d6c1..804b68895216 100644 --- a/src/util/virfirmware.c +++ b/src/util/virfirmware.c @@ -67,9 +67,9 @@ virFirmwareParse(const char *str, virFirmwarePtr firmware) goto cleanup; if (token[0]) { - virSkipSpaces((const char **) &token[0]); + virSkipSpaces((const char **)&token[0]); if (token[1]) - virSkipSpaces((const char **) &token[1]); + virSkipSpaces((const char **)&token[1]); } /* Exactly two tokens are expected */ diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 013c95bb5621..32ae53d17153 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -151,7 +151,7 @@ virHostCPUGetStatsFreeBSD(int cpuNum, offset = cpu_times_num * CPUSTATES; } - cpu_times_size = sizeof(long) * cpu_times_num * CPUSTATES; + cpu_times_size = sizeof(long)* cpu_times_num * CPUSTATES; if (VIR_ALLOC_N(cpu_times, cpu_times_num * CPUSTATES) < 0) goto cleanup; diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index c923a1edf53d..8d83f5678732 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -660,7 +660,7 @@ virHostMemGetInfoFake(unsigned long long *mem, goto cleanup; } - *mem = (unsigned long long) total; + *mem = (unsigned long long)total; } if (freeMem) { @@ -672,7 +672,7 @@ virHostMemGetInfoFake(unsigned long long *mem, goto cleanup; } - *freeMem = (unsigned long long) avail; + *freeMem = (unsigned long long)avail; } ret = 0; @@ -778,7 +778,7 @@ virHostMemGetFreePages(unsigned int npages, goto cleanup; } - lastCell = MIN(lastCell, startCell + (int) cellCount - 1); + lastCell = MIN(lastCell, startCell + (int)cellCount - 1); for (cell = startCell; cell <= lastCell; cell++) { for (i = 0; i < npages; i++) { @@ -825,7 +825,7 @@ virHostMemAllocPages(unsigned int npages, goto cleanup; } - lastCell = MIN(lastCell, startCell + (int) cellCount - 1); + lastCell = MIN(lastCell, startCell + (int)cellCount - 1); for (cell = startCell; cell <= lastCell; cell++) { for (i = 0; i < npages; i++) { diff --git a/src/util/viridentity.c b/src/util/viridentity.c index 2f4307bc8284..c63be3eeecbb 100644 --- a/src/util/viridentity.c +++ b/src/util/viridentity.c @@ -502,7 +502,7 @@ int virIdentitySetUNIXProcessID(virIdentityPtr ident, { char *val; int ret; - if (virAsprintf(&val, "%lld", (long long) pid) < 0) + if (virAsprintf(&val, "%lld", (long long)pid) < 0) return -1; ret = virIdentitySetAttr(ident, VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, diff --git a/src/util/virjson.c b/src/util/virjson.c index dfe00d9280da..5db235ab6ad9 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -398,7 +398,7 @@ virJSONValueFree(virJSONValuePtr value) if (!value || value->protect) return; - switch ((virJSONType) value->type) { + switch ((virJSONType)value->type) { case VIR_JSON_TYPE_OBJECT: for (i = 0; i < value->data.object.npairs; i++) { VIR_FREE(value->data.object.pairs[i].key); @@ -1463,7 +1463,7 @@ virJSONValueCopy(const virJSONValue *in) if (!in) return NULL; - switch ((virJSONType) in->type) { + switch ((virJSONType)in->type) { case VIR_JSON_TYPE_OBJECT: out = virJSONValueNewObject(); if (!out) diff --git a/src/util/virlog.c b/src/util/virlog.c index 81a9dc4395c2..1195d0479d82 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -752,7 +752,7 @@ virLogOutputToFd(virLogSourcePtr source ATTRIBUTE_UNUSED, const char *str, void *data) { - int fd = (intptr_t) data; + int fd = (intptr_t)data; char *msg; if (fd < 0) @@ -772,7 +772,7 @@ virLogOutputToFd(virLogSourcePtr source ATTRIBUTE_UNUSED, static void virLogCloseFd(void *data) { - int fd = (intptr_t) data; + int fd = (intptr_t)data; VIR_LOG_CLOSE(fd); } @@ -1008,7 +1008,7 @@ virLogOutputToJournald(virLogSourcePtr source, { virCheckFlags(VIR_LOG_STACK_TRACE,); int buffd = -1; - int journalfd = (intptr_t) data; + int journalfd = (intptr_t)data; struct msghdr mh; struct sockaddr_un sa; union { @@ -1129,7 +1129,7 @@ virLogNewOutputToJournald(int priority) } if (!(ret = virLogOutputNew(virLogOutputToJournald, virLogCloseFd, - (void *)(intptr_t) journalfd, priority, + (void *)(intptr_t)journalfd, priority, VIR_LOG_TO_JOURNALD, NULL))) { VIR_LOG_CLOSE(journalfd); return NULL; diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index 7afe032b9c83..2c3101c8a00e 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -167,7 +167,7 @@ virMacAddrParse(const char* str, virMacAddrPtr addr) (0xFF < result)) break; - addr->addr[i] = (unsigned char) result; + addr->addr[i] = (unsigned char)result; if ((i == 5) && (*end_ptr <= ' ')) return 0; diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index 88ca9b3f36ae..9f1c7d6811c5 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -98,7 +98,7 @@ virMacMapAddLocked(virMacMapPtr mgr, goto cleanup; } - if (!(newMacsList = virStringListAdd((const char **) macsList, mac)) || + if (!(newMacsList = virStringListAdd((const char **)macsList, mac)) || virHashUpdateEntry(mgr->macs, domain, newMacsList) < 0) goto cleanup; newMacsList = NULL; diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index b250af9e2c10..1c1f625aeb75 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -534,7 +534,7 @@ int virNetDevSetNamespace(const char *ifname, pid_t pidInNs) char *phy_path = NULL; int len; - if (virAsprintf(&pid, "%lld", (long long) pidInNs) == -1) + if (virAsprintf(&pid, "%lld", (long long)pidInNs) == -1) return -1; /* The 802.11 wireless devices only move together with their PHY. */ @@ -3448,7 +3448,7 @@ int virNetDevSetCoalesce(const char *ifname, if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) return -1; - ifr.ifr_data = (void *) &coal; + ifr.ifr_data = (void *)&coal; if (virNetDevSendEthtoolIoctl(fd, &ifr) < 0) { virReportSystemError(errno, diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index bd0710ad2e45..215e07b4191c 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -198,7 +198,7 @@ virNetDevProbeVnetHdr(int tapfd) return 1; # else - (void) tapfd; + (void)tapfd; VIR_INFO("Not enabling IFF_VNET_HDR; disabled at build time"); return 0; # endif diff --git a/src/util/virobject.c b/src/util/virobject.c index 9fb0328d5879..ebfe753843d9 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -606,7 +606,7 @@ virObjectListFree(void *list) if (!list) return; - for (next = (void **) list; *next; next++) + for (next = (void **)list; *next; next++) virObjectUnref(*next); VIR_FREE(list); diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 58ab29f77f2c..6ac2bfd08bdd 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -75,7 +75,7 @@ int virPidFileWritePath(const char *pidfile, goto cleanup; } - snprintf(pidstr, sizeof(pidstr), "%lld", (long long) pid); + snprintf(pidstr, sizeof(pidstr), "%lld", (long long)pid); if (safewrite(fd, pidstr, strlen(pidstr)) < 0) { rc = -errno; @@ -150,7 +150,7 @@ int virPidFileReadPath(const char *path, if (virStrToLong_ll(pidstr, &endptr, 10, &pid_value) < 0 || !(*endptr == '\0' || c_isspace(*endptr)) || - (pid_t) pid_value != pid_value) { + (pid_t)pid_value != pid_value) { rc = -1; goto cleanup; } @@ -444,7 +444,7 @@ int virPidFileAcquirePath(const char *path, /* Someone else must be racing with us, so try again */ } - snprintf(pidstr, sizeof(pidstr), "%lld", (long long) pid); + snprintf(pidstr, sizeof(pidstr), "%lld", (long long)pid); if (safewrite(fd, pidstr, strlen(pidstr)) < 0) { virReportSystemError(errno, diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index 198439cea291..717de12bc90a 100644 --- a/src/util/virpolkit.c +++ b/src/util/virpolkit.c @@ -75,7 +75,7 @@ int virPolkitCheckAuth(const char *actionid, goto cleanup; VIR_INFO("Checking PID %lld running as %d", - (long long) pid, uid); + (long long)pid, uid); if (virDBusCallMethod(sysbus, &reply, @@ -179,7 +179,7 @@ virPolkitAgentCreate(void) agent->cmd = virCommandNewArgList(PKTTYAGENT, "--process", NULL); - virCommandAddArgFormat(agent->cmd, "%lld", (long long int) getpid()); + virCommandAddArgFormat(agent->cmd, "%lld", (long long int)getpid()); virCommandAddArg(agent->cmd, "--notify-fd"); virCommandAddArgFormat(agent->cmd, "%d", pipe_fd[1]); virCommandAddArg(agent->cmd, "--fallback"); diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 1fbbbb3a279f..899c39d97b76 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -196,7 +196,7 @@ virProcessAbort(pid_t pid) } } } - VIR_DEBUG("failed to reap child %lld, abandoning it", (long long) pid); + VIR_DEBUG("failed to reap child %lld, abandoning it", (long long)pid); cleanup: VIR_FREE(tmp); @@ -242,7 +242,7 @@ virProcessWait(pid_t pid, int *exitstatus, bool raw) if (pid <= 0) { if (pid != -1) virReportSystemError(EINVAL, _("unable to wait for process %lld"), - (long long) pid); + (long long)pid); return -1; } @@ -252,7 +252,7 @@ virProcessWait(pid_t pid, int *exitstatus, bool raw) if (ret == -1) { virReportSystemError(errno, _("unable to wait for process %lld"), - (long long) pid); + (long long)pid); return -1; } @@ -274,7 +274,7 @@ virProcessWait(pid_t pid, int *exitstatus, bool raw) char *st = virProcessTranslateStatus(status); virReportError(VIR_ERR_INTERNAL_ERROR, _("Child process (%lld) unexpected %s"), - (long long) pid, NULLSTR(st)); + (long long)pid, NULLSTR(st)); VIR_FREE(st); } return -1; @@ -611,7 +611,7 @@ int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids) *npids = 0; *pids = NULL; - if (virAsprintf(&taskPath, "/proc/%llu/task", (long long) pid) < 0) + if (virAsprintf(&taskPath, "/proc/%llu/task", (long long)pid) < 0) goto cleanup; if (virDirOpen(&dir, taskPath) < 0) @@ -659,7 +659,7 @@ int virProcessGetNamespaces(pid_t pid, int fd; if (virAsprintf(&nsfile, "/proc/%llu/ns/%s", - (long long) pid, + (long long)pid, ns[i]) < 0) goto cleanup; @@ -774,7 +774,7 @@ virProcessSetMaxMemLock(pid_t pid, unsigned long long bytes) } VIR_DEBUG("Locked memory for process %lld limited to %llu bytes", - (long long int) pid, bytes); + (long long int)pid, bytes); return 0; } @@ -812,7 +812,7 @@ virProcessGetMaxMemLock(pid_t pid, virReportSystemError(errno, _("cannot get locked memory limit " "of process %lld"), - (long long int) pid); + (long long int)pid); return -1; } } @@ -984,7 +984,7 @@ int virProcessGetStartTime(pid_t pid, int len; char **tokens = NULL; - if (virAsprintf(&filename, "/proc/%llu/stat", (long long) pid) < 0) + if (virAsprintf(&filename, "/proc/%llu/stat", (long long)pid) < 0) return -1; if ((len = virFileReadAll(filename, 1024, &buf)) < 0) @@ -1067,7 +1067,7 @@ int virProcessGetStartTime(pid_t pid, static int warned; if (virAtomicIntInc(&warned) == 1) { VIR_WARN("Process start time of pid %lld not available on this platform", - (long long) pid); + (long long)pid); } *timestamp = 0; return 0; @@ -1084,7 +1084,7 @@ static int virProcessNamespaceHelper(int errfd, int fd = -1; int ret = -1; - if (virAsprintf(&path, "/proc/%lld/ns/mnt", (long long) pid) < 0) + if (virAsprintf(&path, "/proc/%lld/ns/mnt", (long long)pid) < 0) goto cleanup; if ((fd = open(path, O_RDONLY)) < 0) { @@ -1359,7 +1359,7 @@ virProcessSetScheduler(pid_t pid, int pol = virProcessSchedTranslatePolicy(policy); VIR_DEBUG("pid=%lld, policy=%d, priority=%u", - (long long) pid, policy, priority); + (long long)pid, policy, priority); if (!policy) return 0; @@ -1402,7 +1402,7 @@ virProcessSetScheduler(pid_t pid, if (sched_setscheduler(pid, pol, ¶m) < 0) { virReportSystemError(errno, _("Cannot set scheduler parameters for pid %lld"), - (long long) pid); + (long long)pid); return -1; } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index fc1163508ac1..16d6eadf46bb 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -972,7 +972,7 @@ virResctrlAllocParseProcessLine(virResctrlInfoPtr resctrl, int ret = -1; /* For no reason there can be spaces */ - virSkipSpaces((const char **) &line); + virSkipSpaces((const char **)&line); /* Skip lines that don't concern caches, e.g. MB: etc. */ if (line[0] != 'L') @@ -1612,7 +1612,7 @@ virResctrlAllocAddPID(virResctrlAllocPtr alloc, if (virAsprintf(&tasks, "%s/tasks", alloc->path) < 0) return -1; - if (virAsprintf(&pidstr, "%lld", (long long int) pid) < 0) + if (virAsprintf(&pidstr, "%lld", (long long int)pid) < 0) goto cleanup; if (virFileWriteStr(tasks, pidstr, 0) < 0) { diff --git a/src/util/virsexpr.c b/src/util/virsexpr.c index 885c382a5f3f..18c0787d2734 100644 --- a/src/util/virsexpr.c +++ b/src/util/virsexpr.c @@ -141,8 +141,8 @@ sexpr_cons(const struct sexpr *car, const struct sexpr *cdr) if (ret == NULL) return ret; ret->kind = SEXPR_CONS; - ret->u.s.car = (struct sexpr *) car; - ret->u.s.cdr = (struct sexpr *) cdr; + ret->u.s.car = (struct sexpr *)car; + ret->u.s.cdr = (struct sexpr *)cdr; return ret; } @@ -166,7 +166,7 @@ append(struct sexpr *lst, const struct sexpr *value) lst = lst->u.s.cdr; lst->kind = SEXPR_CONS; - lst->u.s.car = (struct sexpr *) value; + lst->u.s.car = (struct sexpr *)value; lst->u.s.cdr = nil; return 0; @@ -421,7 +421,7 @@ sexpr_lookup_key(const struct sexpr *sexpr, const char *node) if (token != NULL) goto cleanup; - result = (struct sexpr *) sexpr; + result = (struct sexpr *)sexpr; cleanup: VIR_FREE(buffer); diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 531540ac9184..8a623fd47e8e 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -3462,7 +3462,7 @@ virStorageSourceUpdatePhysicalSize(virStorageSourcePtr src, break; case VIR_STORAGE_TYPE_BLOCK: - if ((end = lseek(fd, 0, SEEK_END)) == (off_t) -1) { + if ((end = lseek(fd, 0, SEEK_END)) == (off_t)-1) { virReportSystemError(errno, _("failed to seek to end of '%s'"), src->path); return -1; @@ -3768,7 +3768,7 @@ virStorageFileCanonicalizePath(const char *path, goto cleanup; } - if (virHashAddEntry(cycle, currentpath, (void *) 1) < 0) + if (virHashAddEntry(cycle, currentpath, (void *)1) < 0) goto cleanup; if (linkpath[0] == '/') { @@ -4204,12 +4204,12 @@ virStorageFileInitAs(virStorageSourcePtr src, if (VIR_ALLOC(src->drv) < 0) return -1; - if (uid == (uid_t) -1) + if (uid == (uid_t)-1) src->drv->uid = geteuid(); else src->drv->uid = uid; - if (gid == (gid_t) -1) + if (gid == (gid_t)-1) src->drv->gid = getegid(); else src->drv->gid = gid; diff --git a/src/util/virstring.c b/src/util/virstring.c index 15f367af7c18..7c6ab0ac93af 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -259,8 +259,8 @@ virStringListMerge(char ***dst, if (!src || !*src) return 0; - dst_len = virStringListLength((const char **) *dst); - src_len = virStringListLength((const char **) *src); + dst_len = virStringListLength((const char **)*dst); + src_len = virStringListLength((const char **)*src); if (VIR_REALLOC_N(*dst, dst_len + src_len + 1) < 0) return -1; @@ -405,7 +405,7 @@ virStrToLong_i(char const *s, char **end_ptr, int base, int *result) errno = 0; val = strtol(s, &p, base); /* exempt from syntax-check */ - err = (errno || (!end_ptr && *p) || p == s || (int) val != val); + err = (errno || (!end_ptr && *p) || p == s || (int)val != val); if (end_ptr) *end_ptr = p; if (err) @@ -431,14 +431,14 @@ virStrToLong_ui(char const *s, char **end_ptr, int base, unsigned int *result) * UINT_MAX regardless of whether long is 32-bit or 64-bit. But * strtoul treats "-1" as ULONG_MAX, and going from ulong back * to uint differs depending on the size of long. */ - if (sizeof(long) > sizeof(int) && memchr(s, '-', p - s)) { + if (sizeof(long)> sizeof(int)&& memchr(s, '-', p - s)) { if (-val > UINT_MAX) err = true; else val &= 0xffffffff; } - err |= (errno || (!end_ptr && *p) || p == s || (unsigned int) val != val); + err |= (errno || (!end_ptr && *p) || p == s || (unsigned int)val != val); if (end_ptr) *end_ptr = p; if (err) @@ -459,7 +459,7 @@ virStrToLong_uip(char const *s, char **end_ptr, int base, unsigned int *result) errno = 0; val = strtoul(s, &p, base); /* exempt from syntax-check */ err = (memchr(s, '-', p - s) || - errno || (!end_ptr && *p) || p == s || (unsigned int) val != val); + errno || (!end_ptr && *p) || p == s || (unsigned int)val != val); if (end_ptr) *end_ptr = p; if (err) @@ -1436,7 +1436,7 @@ virStringEncodeBase64(const uint8_t *buf, size_t buflen) { char *ret; - base64_encode_alloc((const char *) buf, buflen, &ret); + base64_encode_alloc((const char *)buf, buflen, &ret); if (!ret) { virReportOOMError(); return NULL; diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 5795d90c7bfa..9524f84f3b2e 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -562,7 +562,7 @@ virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) } /* now, for each processor found, extract the frequency information */ - tmp_base = (char *) base; + tmp_base = (char *)base; while ((tmp_base = strstr(tmp_base, "cpu number")) && (tmp_base = virSysinfoParseS390Line(tmp_base, "cpu number", &ncpu))) { diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 3be963d704ea..deacdb0a58fb 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -189,7 +189,7 @@ virSystemdGetMachineNameByPID(pid_t pid) reply = NULL; VIR_DEBUG("Domain with pid %lld has object path '%s'", - (long long) pid, object); + (long long)pid, object); if (virDBusCallMethod(conn, &reply, NULL, "org.freedesktop.machine1", @@ -205,7 +205,7 @@ virSystemdGetMachineNameByPID(pid_t pid) goto cleanup; VIR_DEBUG("Domain with pid %lld has machine name '%s'", - (long long) pid, name); + (long long)pid, name); cleanup: VIR_FREE(object); diff --git a/src/util/virthreadjob.c b/src/util/virthreadjob.c index 2f483f9d2626..d10ae260dc3c 100644 --- a/src/util/virthreadjob.c +++ b/src/util/virthreadjob.c @@ -69,7 +69,7 @@ virThreadJobSetWorker(const char *worker) if (!worker || virThreadJobInitialize() < 0) return; - if (virThreadLocalSet(&virThreadJobWorker, (void *) worker) < 0) + if (virThreadLocalSet(&virThreadJobWorker, (void *)worker) < 0) virReportSystemError(errno, _("cannot set worker name to %s"), worker); @@ -86,7 +86,7 @@ virThreadJobSet(const char *caller) if (!caller || virThreadJobInitialize() < 0) return; - if (virThreadLocalSet(&virThreadJobName, (void *) caller) < 0) + if (virThreadLocalSet(&virThreadJobName, (void *)caller) < 0) virReportSystemError(errno, _("cannot set current job to %s"), caller); diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c index 10f2bd2c3a03..d92bb399b8df 100644 --- a/src/util/virthreadpool.c +++ b/src/util/virthreadpool.c @@ -443,7 +443,7 @@ virThreadPoolSetParameters(virThreadPoolPtr pool, } if (minWorkers >= 0) { - if ((size_t) minWorkers > pool->nWorkers && + if ((size_t)minWorkers > pool->nWorkers && virThreadPoolExpand(pool, minWorkers - pool->nWorkers, false) < 0) goto error; @@ -458,7 +458,7 @@ virThreadPoolSetParameters(virThreadPoolPtr pool, if (prioWorkers >= 0) { if (prioWorkers < pool->nPrioWorkers) { virCondBroadcast(&pool->prioCond); - } else if ((size_t) prioWorkers > pool->nPrioWorkers && + } else if ((size_t)prioWorkers > pool->nPrioWorkers && virThreadPoolExpand(pool, prioWorkers - pool->nPrioWorkers, true) < 0) { goto error; diff --git a/src/util/virtime.c b/src/util/virtime.c index 640eb5a1d12c..ad78858ed964 100644 --- a/src/util/virtime.c +++ b/src/util/virtime.c @@ -165,7 +165,7 @@ void virTimeFieldsThen(unsigned long long when, struct tm *fields) fields->tm_yday = days; ip = mon_yday[is_leap_year(y)]; - for (y = 11; days < (long int) ip[y]; --y) + for (y = 11; days < (long int)ip[y]; --y) continue; days -= ip[y]; fields->tm_mon = y; @@ -216,7 +216,7 @@ int virTimeStringThenRaw(unsigned long long when, char *buf) "%4d-%02d-%02d %02d:%02d:%02d.%03d+0000", fields.tm_year, fields.tm_mon, fields.tm_mday, fields.tm_hour, fields.tm_min, fields.tm_sec, - (int) (when % 1000)) >= VIR_TIME_STRING_BUFLEN) { + (int)(when % 1000)) >= VIR_TIME_STRING_BUFLEN) { errno = ERANGE; return -1; } diff --git a/src/util/virutil.c b/src/util/virutil.c index cd6fbf2f306a..ed6faef3f9b0 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -86,8 +86,8 @@ #include "virstring.h" #include "virutil.h" -verify(sizeof(gid_t) <= sizeof(unsigned int) && - sizeof(uid_t) <= sizeof(unsigned int)); +verify(sizeof(gid_t)<= sizeof(unsigned int)&& + sizeof(uid_t)<= sizeof(unsigned int)); #define VIR_FROM_THIS VIR_FROM_NONE @@ -463,7 +463,7 @@ int virEnumFromString(const char *const*types, /** * Format @val as a base-10 decimal number, in the * buffer @buf of size @buflen. To allocate a suitable - * sized buffer, the INT_BUFLEN(int) macro should be + * sized buffer, the INT_BUFLEN(int)macro should be * used * * Returns pointer to start of the number in @buf @@ -814,7 +814,7 @@ virGetUserEnt(uid_t uid, char **name, gid_t *group, char **dir, char **shell, bo virReportSystemError(rc, _("Failed to find user record for uid '%u'"), - (unsigned int) uid); + (unsigned int)uid); goto cleanup; } else if (pw == NULL) { if (quiet) @@ -822,7 +822,7 @@ virGetUserEnt(uid_t uid, char **name, gid_t *group, char **dir, char **shell, bo virReportError(VIR_ERR_SYSTEM_ERROR, _("Failed to find user record for uid '%u'"), - (unsigned int) uid); + (unsigned int)uid); goto cleanup; } @@ -883,11 +883,11 @@ static char *virGetGroupEnt(gid_t gid) if (rc != 0) { virReportSystemError(rc, _("Failed to find group record for gid '%u'"), - (unsigned int) gid); + (unsigned int)gid); } else { virReportError(VIR_ERR_SYSTEM_ERROR, _("Failed to find group record for gid '%u'"), - (unsigned int) gid); + (unsigned int)gid); } VIR_FREE(strbuf); @@ -1040,7 +1040,7 @@ virGetUserID(const char *user, uid_t *uid) } if (virStrToLong_ui(user, NULL, 10, &uint_uid) < 0 || - ((uid_t) uint_uid) != uint_uid) { + ((uid_t)uint_uid) != uint_uid) { virReportError(VIR_ERR_INVALID_ARG, _("Failed to parse user '%s'"), user); return -1; @@ -1120,7 +1120,7 @@ virGetGroupID(const char *group, gid_t *gid) } if (virStrToLong_ui(group, NULL, 10, &uint_gid) < 0 || - ((gid_t) uint_gid) != uint_gid) { + ((gid_t)uint_gid) != uint_gid) { virReportError(VIR_ERR_INVALID_ARG, _("Failed to parse group '%s'"), group); return -1; @@ -1194,7 +1194,7 @@ virSetUIDGID(uid_t uid, gid_t gid, gid_t *groups ATTRIBUTE_UNUSED, if (gid != (gid_t)-1 && setregid(gid, gid) < 0) { virReportSystemError(errno, _("cannot change to '%u' group"), - (unsigned int) gid); + (unsigned int)gid); return -1; } @@ -1209,7 +1209,7 @@ virSetUIDGID(uid_t uid, gid_t gid, gid_t *groups ATTRIBUTE_UNUSED, if (uid != (uid_t)-1 && setreuid(uid, uid) < 0) { virReportSystemError(errno, _("cannot change to uid to '%u'"), - (unsigned int) uid); + (unsigned int)uid); return -1; } @@ -1941,7 +1941,7 @@ virGetListenFDs(void) if ((pid_t)procid != getpid()) { VIR_DEBUG("LISTEN_PID %s is not for us %lld", - pidstr, (long long) getpid()); + pidstr, (long long)getpid()); return 0; } @@ -2087,7 +2087,7 @@ virMemoryMaxValue(bool capped) { /* On 32-bit machines, our bound is 0xffffffff * KiB. On 64-bit * machines, our bound is off_t (2^63). */ - if (capped && sizeof(unsigned long) < sizeof(long long)) + if (capped && sizeof(unsigned long)< sizeof(long long)) return 1024ull * ULONG_MAX; else return LLONG_MAX; diff --git a/src/util/virutil.h b/src/util/virutil.h index be0f6b0ea855..c2136b1cf145 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -127,9 +127,9 @@ static inline int pthread_sigmask(int how, const void *set, void *old) { - (void) how; - (void) set; - (void) old; + (void)how; + (void)set; + (void)old; return 0; } # endif diff --git a/src/util/virxml.c b/src/util/virxml.c index 6e87605ea5e4..6590d9a9f31a 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -81,7 +81,7 @@ virXPathString(const char *xpath, xmlXPathFreeObject(obj); return NULL; } - ignore_value(VIR_STRDUP(ret, (char *) obj->stringval)); + ignore_value(VIR_STRDUP(ret, (char *)obj->stringval)); xmlXPathFreeObject(obj); return ret; } @@ -184,11 +184,11 @@ virXPathLongBase(const char *xpath, ctxt->node = relnode; if ((obj != NULL) && (obj->type == XPATH_STRING) && (obj->stringval != NULL) && (obj->stringval[0] != 0)) { - if (virStrToLong_l((char *) obj->stringval, NULL, base, value) < 0) + if (virStrToLong_l((char *)obj->stringval, NULL, base, value) < 0) ret = -2; } else if ((obj != NULL) && (obj->type == XPATH_NUMBER) && (!(isnan(obj->floatval)))) { - *value = (long) obj->floatval; + *value = (long)obj->floatval; if (*value != obj->floatval) ret = -2; } else { @@ -222,7 +222,7 @@ virXPathInt(const char *xpath, ret = virXPathLongBase(xpath, ctxt, 10, &tmp); if (ret < 0) return ret; - if ((int) tmp != tmp) + if ((int)tmp != tmp) return -2; *value = tmp; return 0; @@ -289,11 +289,11 @@ virXPathULongBase(const char *xpath, ctxt->node = relnode; if ((obj != NULL) && (obj->type == XPATH_STRING) && (obj->stringval != NULL) && (obj->stringval[0] != 0)) { - if (virStrToLong_ul((char *) obj->stringval, NULL, base, value) < 0) + if (virStrToLong_ul((char *)obj->stringval, NULL, base, value) < 0) ret = -2; } else if ((obj != NULL) && (obj->type == XPATH_NUMBER) && (!(isnan(obj->floatval)))) { - *value = (unsigned long) obj->floatval; + *value = (unsigned long)obj->floatval; if (*value != obj->floatval) ret = -2; } else { @@ -327,7 +327,7 @@ virXPathUInt(const char *xpath, ret = virXPathULongBase(xpath, ctxt, 10, &tmp); if (ret < 0) return ret; - if ((unsigned int) tmp != tmp) + if ((unsigned int)tmp != tmp) return -2; *value = tmp; return 0; @@ -405,11 +405,11 @@ virXPathULongLong(const char *xpath, ctxt->node = relnode; if ((obj != NULL) && (obj->type == XPATH_STRING) && (obj->stringval != NULL) && (obj->stringval[0] != 0)) { - if (virStrToLong_ull((char *) obj->stringval, NULL, 10, value) < 0) + if (virStrToLong_ull((char *)obj->stringval, NULL, 10, value) < 0) ret = -2; } else if ((obj != NULL) && (obj->type == XPATH_NUMBER) && (!(isnan(obj->floatval)))) { - *value = (unsigned long long) obj->floatval; + *value = (unsigned long long)obj->floatval; if (*value != obj->floatval) ret = -2; } else { @@ -451,11 +451,11 @@ virXPathLongLong(const char *xpath, ctxt->node = relnode; if ((obj != NULL) && (obj->type == XPATH_STRING) && (obj->stringval != NULL) && (obj->stringval[0] != 0)) { - if (virStrToLong_ll((char *) obj->stringval, NULL, 10, value) < 0) + if (virStrToLong_ll((char *)obj->stringval, NULL, 10, value) < 0) ret = -2; } else if ((obj != NULL) && (obj->type == XPATH_NUMBER) && (!(isnan(obj->floatval)))) { - *value = (long long) obj->floatval; + *value = (long long)obj->floatval; if (*value != obj->floatval) ret = -2; } else { @@ -715,7 +715,7 @@ catchXMLError(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) return; if (ctxt->_private) - domcode = ((struct virParserData *) ctxt->_private)->domcode; + domcode = ((struct virParserData *)ctxt->_private)->domcode; cur = ctxt->input->cur; @@ -1060,7 +1060,7 @@ virXMLFindChildNodeByNs(xmlNodePtr root, for (next = root->children; next; next = next->next) { if (next->ns && - STREQ_NULLABLE((const char *) next->ns->href, uri)) + STREQ_NULLABLE((const char *)next->ns->href, uri)) return next; } @@ -1207,8 +1207,8 @@ virXMLNodeSanitizeNamespaces(xmlNodePtr node) dupl = NULL; if (child->ns && next->ns && - STREQ_NULLABLE((const char *) child->ns->href, - (const char *) next->ns->href)) + STREQ_NULLABLE((const char *)child->ns->href, + (const char *)next->ns->href)) dupl = next; next = next->next; -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/vbox/vbox_common.c | 4 ++-- src/vbox/vbox_tmpl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 72a24a34642d..74a7ba0c3e28 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -352,7 +352,7 @@ vboxSetStorageController(virDomainControllerDefPtr controller, int ret = -1; /* libvirt controller type => vbox bus type */ - switch ((virDomainControllerType) controller->type) { + switch ((virDomainControllerType)controller->type) { case VIR_DOMAIN_CONTROLLER_TYPE_FDC: VBOX_UTF8_TO_UTF16(VBOX_CONTROLLER_FLOPPY_NAME, &controllerName); vboxBusType = StorageBus_Floppy; @@ -7517,7 +7517,7 @@ vboxDomainScreenshot(virDomainPtr dom, goto endjob; } - if (safewrite(tmp_fd, (char *) screenData, + if (safewrite(tmp_fd, (char *)screenData, screenDataSize) < 0) { virReportSystemError(errno, _("unable to write data " "to '%s'"), tmp); diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 88792c992897..cf0dbdc804d6 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1649,7 +1649,7 @@ _vrdeServerGetPorts(vboxDriverPtr data, IVRDEServer *VRDEServer, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to read RDP port value, rc=%08x"), - (unsigned) rc); + (unsigned)rc); goto cleanup; } -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/vmx/vmx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 8027a7bba629..df6a58a4743a 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1309,8 +1309,8 @@ virVMXConfigScanResultsCollector(const char* name, return -1; } - if ((int) idx > results->networks_max_index) - results->networks_max_index = (int) idx; + if ((int)idx > results->networks_max_index) + results->networks_max_index = (int)idx; } return 0; -- 2.17.0
On Wed, Apr 25, 2018 at 03:25:00PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/vmx/vmx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/vz/vz_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index 40a1ce23dd16..7137a2a8b6e3 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -48,7 +48,7 @@ } while (0) # define PARALLELS_DOMAIN_ROUTED_NETWORK_NAME "host-routed" -# define VIRTUOZZO_VER_7 ((unsigned long) 7000000) +# define VIRTUOZZO_VER_7 ((unsigned long)7000000) struct _vzCapabilities { virStorageFileFormat vmDiskFormat; -- 2.17.0
On Wed, Apr 25, 2018 at 03:25:01PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/vz/vz_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/xenapi/xenapi_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 42b305d3169c..3eb1428ba197 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1490,7 +1490,7 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) memory = xenapiDomainGetMaxMemory(dom); virDomainDefSetMemoryTotal(defPtr, memory); if (xen_vm_get_memory_dynamic_max(session, &dynamic_mem, vm)) { - defPtr->mem.cur_balloon = (unsigned long) (dynamic_mem / 1024); + defPtr->mem.cur_balloon = (unsigned long)(dynamic_mem / 1024); } else { defPtr->mem.cur_balloon = memory; } @@ -2101,7 +2101,7 @@ write_func(void *ptr, size_t size, size_t nmemb, void *comms_) printf("%s\n", (char*) ptr); fflush(stdout); #endif - return (size_t) (comms->func(ptr, n, comms->handle) ? n : 0); + return (size_t)(comms->func(ptr, n, comms->handle) ? n : 0); } /* -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/xenconfig/xen_common.c | 4 ++-- src/xenconfig/xen_xl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 7db365f36341..a2b0708ee309 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -268,7 +268,7 @@ xenConfigSetInt(virConfPtr conf, const char *setting, long long l) { virConfValuePtr value = NULL; - if ((long) l != l) { + if ((long)l != l) { virReportError(VIR_ERR_OVERFLOW, _("failed to store %lld to %s"), l, setting); return -1; @@ -1673,7 +1673,7 @@ xenFormatCPUFeatures(virConfPtr conf, virDomainDefPtr def) } for (i = 0; i < def->clock.ntimers; i++) { - switch ((virDomainTimerNameType) def->clock.timers[i]->name) { + switch ((virDomainTimerNameType)def->clock.timers[i]->name) { case VIR_DOMAIN_TIMER_NAME_TSC: switch (def->clock.timers[i]->mode) { case VIR_DOMAIN_TIMER_MODE_NATIVE: diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 6dcaba98a439..35d52f8a34c1 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -1601,7 +1601,7 @@ xenFormatXLDiskSrc(virStorageSourcePtr src, char **srcstr) if (virStorageSourceIsEmpty(src)) return 0; - switch ((virStorageType) actualType) { + switch ((virStorageType)actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: case VIR_STORAGE_TYPE_DIR: -- 2.17.0
On Wed, Apr 25, 2018 at 03:25:03PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/xenconfig/xen_common.c | 4 ++-- src/xenconfig/xen_xl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- tests/domaincapstest.c | 4 +- tests/qemuhotplugtest.c | 2 +- tests/qemumonitorjsontest.c | 42 +++++++++--------- tests/qemuxml2argvtest.c | 4 +- tests/testutils.c | 2 +- tests/testutils.h | 2 +- tests/testutilshostcpus.h | 88 ++++++++++++++++++------------------- tests/virbitmaptest.c | 4 +- tests/vircaps2xmltest.c | 2 +- tests/virfiletest.c | 18 ++++---- tests/virfilewrapper.c | 2 +- tests/virhashtest.c | 8 ++-- tests/virhostcputest.c | 2 +- tests/virhostdevtest.c | 2 +- tests/virpcimock.c | 2 +- tests/virpcitest.c | 2 +- tests/virresctrltest.c | 2 +- tests/virschematest.c | 2 +- tests/virstoragetest.c | 42 +++++++++--------- tests/virstringtest.c | 12 ++--- tests/virusbmock.c | 2 +- 21 files changed, 123 insertions(+), 123 deletions(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 06e77fd5861a..94c466c42ca6 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -68,8 +68,8 @@ fillAllCaps(virDomainCapsPtr domCaps) virCPUDef host = { .type = VIR_CPU_TYPE_HOST, .arch = VIR_ARCH_X86_64, - .model = (char *) "host", - .vendor = (char *) "CPU Vendorrr", + .model = (char *)"host", + .vendor = (char *)"CPU Vendorrr", }; domCaps->maxvcpus = 255; diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 85e53653e1bd..77dcc39fadc4 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -227,7 +227,7 @@ static int testQemuHotplug(const void *data) { int ret = -1; - struct qemuHotplugTestData *test = (struct qemuHotplugTestData *) data; + struct qemuHotplugTestData *test = (struct qemuHotplugTestData *)data; char *domain_filename = NULL; char *device_filename = NULL; char *result_filename = NULL; diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index f8d39c35abda..b9a0de49c587 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -853,20 +853,20 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr xmlopt) memset(&chr, 0, sizeof(chr)); chr.type = VIR_DOMAIN_CHR_TYPE_FILE; - chr.data.file.path = (char *) "/test/path"; + chr.data.file.path = (char *)"/test/path"; CHECK("file", false, "{'id':'alias','backend':{'type':'file','data':{'out':'/test/path'}}}"); memset(&chr, 0, sizeof(chr)); chr.type = VIR_DOMAIN_CHR_TYPE_DEV; - chr.data.file.path = (char *) "/test/path"; + chr.data.file.path = (char *)"/test/path"; CHECK("device", false, "{'id':'alias','backend':{'type':'serial','data':{'device':'/test/path'}}}"); memset(&chr, 0, sizeof(chr)); chr.type = VIR_DOMAIN_CHR_TYPE_TCP; - chr.data.tcp.host = (char *) "example.com"; - chr.data.tcp.service = (char *) "1234"; + chr.data.tcp.host = (char *)"example.com"; + chr.data.tcp.service = (char *)"1234"; CHECK("tcp", false, "{'id':'alias'," "'backend':{'type':'socket'," @@ -879,8 +879,8 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr xmlopt) memset(&chr, 0, sizeof(chr)); chr.type = VIR_DOMAIN_CHR_TYPE_UDP; - chr.data.udp.connectHost = (char *) "example.com"; - chr.data.udp.connectService = (char *) "1234"; + chr.data.udp.connectHost = (char *)"example.com"; + chr.data.udp.connectService = (char *)"1234"; CHECK("udp", false, "{'id':'alias'," "'backend':{'type':'udp'," @@ -888,8 +888,8 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr xmlopt) "'data':{'host':'example.com'," "'port':'1234'}}}}}"); - chr.data.udp.bindHost = (char *) "localhost"; - chr.data.udp.bindService = (char *) "4321"; + chr.data.udp.bindHost = (char *)"localhost"; + chr.data.udp.bindService = (char *)"4321"; CHECK("udp", false, "{'id':'alias'," "'backend':{'type':'udp'," @@ -901,7 +901,7 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr xmlopt) "'port':'4321'}}}}}"); chr.data.udp.bindHost = NULL; - chr.data.udp.bindService = (char *) "4321"; + chr.data.udp.bindService = (char *)"4321"; CHECK("udp", false, "{'id':'alias'," "'backend':{'type':'udp'," @@ -913,7 +913,7 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr xmlopt) "'port':'4321'}}}}}"); memset(&chr, 0, sizeof(chr)); chr.type = VIR_DOMAIN_CHR_TYPE_UNIX; - chr.data.nix.path = (char *) "/path/to/socket"; + chr.data.nix.path = (char *)"/path/to/socket"; CHECK("unix", false, "{'id':'alias'," "'backend':{'type':'socket'," @@ -1185,14 +1185,14 @@ testQemuMonitorJSONGetDeviceAliases(const void *data) } ret = 0; - for (alias = (const char **) aliases; *alias; alias++) { + for (alias = (const char **)aliases; *alias; alias++) { if (!virStringListHasString(expected, *alias)) { fprintf(stderr, "got unexpected device alias '%s'\n", *alias); ret = -1; } } for (alias = expected; *alias; alias++) { - if (!virStringListHasString((const char **) aliases, *alias)) { + if (!virStringListHasString((const char **)aliases, *alias)) { fprintf(stderr, "missing expected alias '%s'\n", *alias); ret = -1; } @@ -1411,14 +1411,14 @@ testQemuMonitorJSONqemuMonitorJSONQueryCPUs(const void *data) qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); int ret = -1; struct qemuMonitorQueryCpusEntry expect_slow[] = { - {0, 17622, (char *) "/machine/unattached/device[0]", true}, - {1, 17624, (char *) "/machine/unattached/device[1]", true}, - {2, 17626, (char *) "/machine/unattached/device[2]", true}, + {0, 17622, (char *)"/machine/unattached/device[0]", true}, + {1, 17624, (char *)"/machine/unattached/device[1]", true}, + {2, 17626, (char *)"/machine/unattached/device[2]", true}, {3, 17628, NULL, true}, }; struct qemuMonitorQueryCpusEntry expect_fast[] = { - {0, 17629, (char *) "/machine/unattached/device[0]", false}, - {1, 17630, (char *) "/machine/unattached/device[1]", false}, + {0, 17629, (char *)"/machine/unattached/device[0]", false}, + {1, 17630, (char *)"/machine/unattached/device[1]", false}, }; if (!test) @@ -1976,8 +1976,8 @@ testQemuMonitorJSONqemuMonitorJSONGetChardevInfo(const void *data) int ret = -1; virHashTablePtr info = NULL, expectedInfo = NULL; qemuMonitorChardevInfo info0 = { NULL, VIR_DOMAIN_CHR_DEVICE_STATE_DEFAULT }; - qemuMonitorChardevInfo info1 = { (char *) "/dev/pts/21", VIR_DOMAIN_CHR_DEVICE_STATE_CONNECTED }; - qemuMonitorChardevInfo info2 = { (char *) "/dev/pts/20", VIR_DOMAIN_CHR_DEVICE_STATE_DEFAULT }; + qemuMonitorChardevInfo info1 = { (char *)"/dev/pts/21", VIR_DOMAIN_CHR_DEVICE_STATE_CONNECTED }; + qemuMonitorChardevInfo info2 = { (char *)"/dev/pts/20", VIR_DOMAIN_CHR_DEVICE_STATE_DEFAULT }; qemuMonitorChardevInfo info3 = { NULL, VIR_DOMAIN_CHR_DEVICE_STATE_DISCONNECTED }; if (!test) @@ -2215,7 +2215,7 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities(const void *data) goto cleanup; cap = qemuMigrationCapabilityTypeToString(QEMU_MIGRATION_CAP_XBZRLE); - if (!virStringListHasString((const char **) caps, cap)) { + if (!virStringListHasString((const char **)caps, cap)) { virReportError(VIR_ERR_INTERNAL_ERROR, "Expected capability %s is missing", cap); goto cleanup; @@ -2601,7 +2601,7 @@ testQemuMonitorCPUInfoFormat(qemuMonitorCPUInfoPtr vcpus, if (vcpu->tid) virBufferAsprintf(&buf, "thread-id='%llu'\n", - (unsigned long long) vcpu->tid); + (unsigned long long)vcpu->tid); if (vcpu->id != 0) virBufferAsprintf(&buf, "enable-id='%d'\n", vcpu->id); diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5b3bd4a99649..3ace44e99422 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -48,7 +48,7 @@ fakeSecretGetValue(virSecretPtr obj ATTRIBUTE_UNUSED, if (VIR_STRDUP(secret, "AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A") < 0) return NULL; *value_size = strlen(secret); - return (unsigned char *) secret; + return (unsigned char *)secret; } static virSecretPtr @@ -438,7 +438,7 @@ testCompareXMLToStartupXML(const void *data) static int testCompareXMLToArgv(const void *data) { - struct testInfo *info = (void *) data; + struct testInfo *info = (void *)data; char *xml = NULL; char *args = NULL; char *migrateURI = NULL; diff --git a/tests/testutils.c b/tests/testutils.c index 4b13d112788a..8b0e61859634 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -626,7 +626,7 @@ virTestDifferenceFullInternal(FILE *stream, /* Show the trimmed differences */ if (expectName) fprintf(stream, "\nIn '%s':", expectName); - fprintf(stream, "\nOffset %d\nExpect [", (int) (expectStart - expect)); + fprintf(stream, "\nOffset %d\nExpect [", (int)(expectStart - expect)); if ((expectEnd - expectStart + 1) && fwrite(expectStart, (expectEnd-expectStart+1), 1, stream) != 1) return -1; diff --git a/tests/testutils.h b/tests/testutils.h index 3bd7bf16034f..474907541741 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -131,7 +131,7 @@ int virTestMain(int argc, return EXIT_FAILURE; \ } \ if (!preload) { \ - newenv = (char *) lib; \ + newenv = (char *)lib; \ } else if (virAsprintf(&newenv, "%s:%s", lib, preload) < 0) { \ perror("virAsprintf"); \ return EXIT_FAILURE; \ diff --git a/tests/testutilshostcpus.h b/tests/testutilshostcpus.h index f0ab23b96226..e18bdd78b33e 100644 --- a/tests/testutilshostcpus.h +++ b/tests/testutilshostcpus.h @@ -3,25 +3,25 @@ #include "util/virarch.h" static virCPUFeatureDef cpuDefaultFeatures[] = { - { (char *) "ds", -1 }, - { (char *) "acpi", -1 }, - { (char *) "ss", -1 }, - { (char *) "ht", -1 }, - { (char *) "tm", -1 }, - { (char *) "pbe", -1 }, - { (char *) "ds_cpl", -1 }, - { (char *) "vmx", -1 }, - { (char *) "est", -1 }, - { (char *) "tm2", -1 }, - { (char *) "cx16", -1 }, - { (char *) "xtpr", -1 }, - { (char *) "lahf_lm", -1 }, + { (char *)"ds", -1 }, + { (char *)"acpi", -1 }, + { (char *)"ss", -1 }, + { (char *)"ht", -1 }, + { (char *)"tm", -1 }, + { (char *)"pbe", -1 }, + { (char *)"ds_cpl", -1 }, + { (char *)"vmx", -1 }, + { (char *)"est", -1 }, + { (char *)"tm2", -1 }, + { (char *)"cx16", -1 }, + { (char *)"xtpr", -1 }, + { (char *)"lahf_lm", -1 }, }; static virCPUDef cpuDefaultData = { .type = VIR_CPU_TYPE_HOST, .arch = VIR_ARCH_X86_64, - .model = (char *) "core2duo", - .vendor = (char *) "Intel", + .model = (char *)"core2duo", + .vendor = (char *)"Intel", .sockets = 1, .cores = 2, .threads = 1, @@ -31,36 +31,36 @@ static virCPUDef cpuDefaultData = { }; static virCPUFeatureDef cpuHaswellFeatures[] = { - { (char *) "vme", -1 }, - { (char *) "ds", -1 }, - { (char *) "acpi", -1 }, - { (char *) "ss", -1 }, - { (char *) "ht", -1 }, - { (char *) "tm", -1 }, - { (char *) "pbe", -1 }, - { (char *) "dtes64", -1 }, - { (char *) "monitor", -1 }, - { (char *) "ds_cpl", -1 }, - { (char *) "vmx", -1 }, - { (char *) "smx", -1 }, - { (char *) "est", -1 }, - { (char *) "tm2", -1 }, - { (char *) "xtpr", -1 }, - { (char *) "pdcm", -1 }, - { (char *) "osxsave", -1 }, - { (char *) "f16c", -1 }, - { (char *) "rdrand", -1 }, - { (char *) "cmt", -1 }, - { (char *) "pdpe1gb", -1 }, - { (char *) "abm", -1 }, - { (char *) "invtsc", -1 }, - { (char *) "lahf_lm", -1 }, + { (char *)"vme", -1 }, + { (char *)"ds", -1 }, + { (char *)"acpi", -1 }, + { (char *)"ss", -1 }, + { (char *)"ht", -1 }, + { (char *)"tm", -1 }, + { (char *)"pbe", -1 }, + { (char *)"dtes64", -1 }, + { (char *)"monitor", -1 }, + { (char *)"ds_cpl", -1 }, + { (char *)"vmx", -1 }, + { (char *)"smx", -1 }, + { (char *)"est", -1 }, + { (char *)"tm2", -1 }, + { (char *)"xtpr", -1 }, + { (char *)"pdcm", -1 }, + { (char *)"osxsave", -1 }, + { (char *)"f16c", -1 }, + { (char *)"rdrand", -1 }, + { (char *)"cmt", -1 }, + { (char *)"pdpe1gb", -1 }, + { (char *)"abm", -1 }, + { (char *)"invtsc", -1 }, + { (char *)"lahf_lm", -1 }, }; static virCPUDef cpuHaswellData = { .type = VIR_CPU_TYPE_HOST, .arch = VIR_ARCH_X86_64, - .model = (char *) "Haswell", - .vendor = (char *) "Intel", + .model = (char *)"Haswell", + .vendor = (char *)"Intel", .sockets = 1, .cores = 2, .threads = 2, @@ -72,7 +72,7 @@ static virCPUDef cpuHaswellData = { static virCPUDef cpuBroadwellData = { .type = VIR_CPU_TYPE_HOST, .arch = VIR_ARCH_X86_64, - .model = (char *) "Broadwell", + .model = (char *)"Broadwell", .sockets = 1, .cores = 2, .threads = 2, @@ -81,7 +81,7 @@ static virCPUDef cpuBroadwellData = { static virCPUDef cpuPower8Data = { .type = VIR_CPU_TYPE_HOST, .arch = VIR_ARCH_PPC64, - .model = (char *) "POWER8", + .model = (char *)"POWER8", .sockets = 1, .cores = 8, .threads = 8, @@ -90,7 +90,7 @@ static virCPUDef cpuPower8Data = { static virCPUDef cpuPower9Data = { .type = VIR_CPU_TYPE_HOST, .arch = VIR_ARCH_PPC64, - .model = (char *) "POWER9", + .model = (char *)"POWER9", .sockets = 1, .cores = 16, .threads = 1, diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index 2fbafc0a7632..f5f84fb8a241 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -252,7 +252,7 @@ test4(const void *data ATTRIBUTE_UNUSED) if (virBitmapNextSetBit(bitmap, i) != -1) goto error; - j = sizeof(bitsPos)/sizeof(int) - 1; + j = sizeof(bitsPos)/sizeof(int)- 1; if (virBitmapLastSetBit(bitmap) != bitsPos[j]) goto error; @@ -314,7 +314,7 @@ test5(const void *v ATTRIBUTE_UNUSED) i = 0; j = -1; - while (i < sizeof(bits)/sizeof(int) && + while (i < sizeof(bits)/sizeof(int)&& (j = virBitmapNextSetBit(bitmap, j)) >= 0) { if (j != bits[i++]) goto error; diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index ede546825edc..f0db6dacfa88 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -41,7 +41,7 @@ struct virCapabilitiesData { static int test_virCapabilities(const void *opaque) { - struct virCapabilitiesData *data = (struct virCapabilitiesData *) opaque; + struct virCapabilitiesData *data = (struct virCapabilitiesData *)opaque; const char *archStr = virArchToString(data->arch); virCapsPtr caps = NULL; char *capsXML = NULL; diff --git a/tests/virfiletest.c b/tests/virfiletest.c index a15495e9e8cd..1934d18c7bea 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -141,7 +141,7 @@ makeSparseFile(const off_t offsets[], if (unlink(path) < 0) goto error; - for (i = 0; offsets[i] != (off_t) -1; i++) + for (i = 0; offsets[i] != (off_t)-1; i++) len += offsets[i] * 1024; while (len) { @@ -160,7 +160,7 @@ makeSparseFile(const off_t offsets[], } len = 0; - for (i = 0; offsets[i] != (off_t) -1; i++) { + for (i = 0; offsets[i] != (off_t)-1; i++) { bool inData = startData; if (i % 2) @@ -171,14 +171,14 @@ makeSparseFile(const off_t offsets[], FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, len, offsets[i] * 1024) < 0) { fprintf(stderr, "unable to punch a hole at offset %lld length %lld\n", - (long long) len, (long long) offsets[i]); + (long long)len, (long long)offsets[i]); goto error; } len += offsets[i] * 1024; } - if (lseek(fd, 0, SEEK_SET) == (off_t) -1) { + if (lseek(fd, 0, SEEK_SET) == (off_t)-1) { fprintf(stderr, "unable to lseek (errno=%d)\n", errno); goto error; } @@ -205,25 +205,25 @@ holesSupported(void) /* The way this works is: there are 4K of data followed by 4K hole followed * by 4K hole again. Check if the filesystem we are running the test suite * on supports holes. */ - if ((tmp = lseek(fd, 0, SEEK_DATA)) == (off_t) -1) + if ((tmp = lseek(fd, 0, SEEK_DATA)) == (off_t)-1) goto cleanup; if (tmp != 0) goto cleanup; - if ((tmp = lseek(fd, tmp, SEEK_HOLE)) == (off_t) -1) + if ((tmp = lseek(fd, tmp, SEEK_HOLE)) == (off_t)-1) goto cleanup; if (tmp != EXTENT * 1024) goto cleanup; - if ((tmp = lseek(fd, tmp, SEEK_DATA)) == (off_t) -1) + if ((tmp = lseek(fd, tmp, SEEK_DATA)) == (off_t)-1) goto cleanup; if (tmp != 2 * EXTENT * 1024) goto cleanup; - if ((tmp = lseek(fd, tmp, SEEK_HOLE)) == (off_t) -1) + if ((tmp = lseek(fd, tmp, SEEK_HOLE)) == (off_t)-1) goto cleanup; if (tmp != 3 * EXTENT * 1024) @@ -270,7 +270,7 @@ testFileInData(const void *opaque) if ((fd = makeSparseFile(data->offsets, data->startData)) < 0) goto cleanup; - for (i = 0; data->offsets[i] != (off_t) -1; i++) { + for (i = 0; data->offsets[i] != (off_t)-1; i++) { bool shouldInData = data->startData; int realInData; long long shouldLen; diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index 062ae63a4909..5f6ebd9d6daf 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -267,7 +267,7 @@ int open(const char *path, int flags, ...) */ if (flags & O_CREAT) { va_start(ap, flags); - mode = (mode_t) va_arg(ap, int); + mode = (mode_t)va_arg(ap, int); va_end(ap); } diff --git a/tests/virhashtest.c b/tests/virhashtest.c index e9c03c1afbbc..997b29bf9a7a 100644 --- a/tests/virhashtest.c +++ b/tests/virhashtest.c @@ -31,7 +31,7 @@ testHashInit(int size) */ for (i = ARRAY_CARDINALITY(uuids) - 1; i >= 0; i--) { ssize_t oldsize = virHashTableSize(hash); - if (virHashAddEntry(hash, uuids[i], (void *) uuids[i]) < 0) { + if (virHashAddEntry(hash, uuids[i], (void *)uuids[i]) < 0) { virHashFree(hash); return NULL; } @@ -127,7 +127,7 @@ testHashUpdate(const void *data ATTRIBUTE_UNUSED) return -1; for (i = 0; i < ARRAY_CARDINALITY(uuids_subset); i++) { - if (virHashUpdateEntry(hash, uuids_subset[i], (void *) 1) < 0) { + if (virHashUpdateEntry(hash, uuids_subset[i], (void *)1) < 0) { VIR_TEST_VERBOSE("\nentry \"%s\" could not be updated\n", uuids_subset[i]); goto cleanup; @@ -135,7 +135,7 @@ testHashUpdate(const void *data ATTRIBUTE_UNUSED) } for (i = 0; i < ARRAY_CARDINALITY(uuids_new); i++) { - if (virHashUpdateEntry(hash, uuids_new[i], (void *) 1) < 0) { + if (virHashUpdateEntry(hash, uuids_new[i], (void *)1) < 0) { VIR_TEST_VERBOSE("\nnew entry \"%s\" could not be updated\n", uuids_new[i]); goto cleanup; @@ -282,7 +282,7 @@ testHashRemoveSetIter(const void *payload ATTRIBUTE_UNUSED, const void *name, const void *data) { - int *count = (int *) data; + int *count = (int *)data; bool rem = false; size_t i; diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index cb318df6e1bb..e739aa3d0d6c 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -168,7 +168,7 @@ linuxTestHostCPU(const void *opaque) char *cpuinfo = NULL; char *sysfs_prefix = NULL; char *output = NULL; - struct linuxTestHostCPUData *data = (struct linuxTestHostCPUData *) opaque; + struct linuxTestHostCPUData *data = (struct linuxTestHostCPUData *)opaque; const char *archStr = virArchToString(data->arch); if (virAsprintf(&sysfs_prefix, "%s/virhostcpudata/linux-%s", diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index 5b03cb6aee5e..b103470ebd8f 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -44,7 +44,7 @@ VIR_LOG_INIT("tests.hostdevtest"); if ((actualCount = virPCIDeviceListCount(list)) != cnt) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ "Unexpected count of items in " #list ": %zu, " \ - "expecting %zu", actualCount, (size_t) cnt); \ + "expecting %zu", actualCount, (size_t)cnt); \ goto cleanup; \ } \ } while (0) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 176c64d65435..fb2ad723e244 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -54,7 +54,7 @@ char *fakesysfspcidir; # define SYSFS_PCI_PREFIX "/sys/bus/pci/" # define STDERR(...) \ - fprintf(stderr, "%s %zu: ", __FUNCTION__, (size_t) __LINE__); \ + fprintf(stderr, "%s %zu: ", __FUNCTION__, (size_t)__LINE__); \ fprintf(stderr, __VA_ARGS__); \ fprintf(stderr, "\n"); \ diff --git a/tests/virpcitest.c b/tests/virpcitest.c index 80e994ae52c5..077e99d86478 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -86,7 +86,7 @@ testVirPCIDeviceNew(const void *opaque ATTRIBUTE_UNUSED) if ((count = virPCIDeviceListCount(list)) != cnt) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ "Unexpected count of items in " #list ": %d, " \ - "expecting %zu", count, (size_t) cnt); \ + "expecting %zu", count, (size_t)cnt); \ goto cleanup; \ } diff --git a/tests/virresctrltest.c b/tests/virresctrltest.c index 99e20d5dec99..111782dca9e9 100644 --- a/tests/virresctrltest.c +++ b/tests/virresctrltest.c @@ -17,7 +17,7 @@ struct virResctrlData { static int test_virResctrlGetUnused(const void *opaque) { - struct virResctrlData *data = (struct virResctrlData *) opaque; + struct virResctrlData *data = (struct virResctrlData *)opaque; char *system_dir = NULL; char *resctrl_dir = NULL; int ret = -1; diff --git a/tests/virschematest.c b/tests/virschematest.c index 2d3583391943..f9f624afc048 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -144,7 +144,7 @@ testSchemaDirs(const char *schema, virXMLValidatorPtr validator, ...) static int testSchemaGrammar(const void *opaque) { - struct testSchemaData *data = (struct testSchemaData *) opaque; + struct testSchemaData *data = (struct testSchemaData *)opaque; char *schema_path; int ret = -1; diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index b032d8b93fd9..fabd0efbd078 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -586,40 +586,40 @@ testPathRelativePrepare(void) } /* normal relative backing chain */ - backingchain[0].path = (char *) "/path/to/some/img"; + backingchain[0].path = (char *)"/path/to/some/img"; - backingchain[1].path = (char *) "/path/to/some/asdf"; - backingchain[1].relPath = (char *) "asdf"; + backingchain[1].path = (char *)"/path/to/some/asdf"; + backingchain[1].relPath = (char *)"asdf"; - backingchain[2].path = (char *) "/path/to/some/test"; - backingchain[2].relPath = (char *) "test"; + backingchain[2].path = (char *)"/path/to/some/test"; + backingchain[2].relPath = (char *)"test"; - backingchain[3].path = (char *) "/path/to/some/blah"; - backingchain[3].relPath = (char *) "blah"; + backingchain[3].path = (char *)"/path/to/some/blah"; + backingchain[3].relPath = (char *)"blah"; /* ovirt's backing chain */ - backingchain[4].path = (char *) "/path/to/volume/image1"; + backingchain[4].path = (char *)"/path/to/volume/image1"; - backingchain[5].path = (char *) "/path/to/volume/image2"; - backingchain[5].relPath = (char *) "../volume/image2"; + backingchain[5].path = (char *)"/path/to/volume/image2"; + backingchain[5].relPath = (char *)"../volume/image2"; - backingchain[6].path = (char *) "/path/to/volume/image3"; - backingchain[6].relPath = (char *) "../volume/image3"; + backingchain[6].path = (char *)"/path/to/volume/image3"; + backingchain[6].relPath = (char *)"../volume/image3"; - backingchain[7].path = (char *) "/path/to/volume/image4"; - backingchain[7].relPath = (char *) "../volume/image4"; + backingchain[7].path = (char *)"/path/to/volume/image4"; + backingchain[7].relPath = (char *)"../volume/image4"; /* some arbitrarily crazy backing chains */ - backingchain[8].path = (char *) "/crazy/base/image"; + backingchain[8].path = (char *)"/crazy/base/image"; - backingchain[9].path = (char *) "/crazy/base/directory/stuff/volumes/garbage/image2"; - backingchain[9].relPath = (char *) "directory/stuff/volumes/garbage/image2"; + backingchain[9].path = (char *)"/crazy/base/directory/stuff/volumes/garbage/image2"; + backingchain[9].relPath = (char *)"directory/stuff/volumes/garbage/image2"; - backingchain[10].path = (char *) "/crazy/base/directory/image3"; - backingchain[10].relPath = (char *) "../../../image3"; + backingchain[10].path = (char *)"/crazy/base/directory/image3"; + backingchain[10].relPath = (char *)"../../../image3"; - backingchain[11].path = (char *) "/crazy/base/blah/image4"; - backingchain[11].relPath = (char *) "../blah/image4"; + backingchain[11].path = (char *)"/crazy/base/blah/image4"; + backingchain[11].relPath = (char *)"../blah/image4"; } diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 1230aba5b7a3..a521bcff8065 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -47,7 +47,7 @@ static int testStreq(const void *args) bool streq_rv, strneq_rv; size_t i; - if ((size_t) data->a ^ (size_t) data->b) + if ((size_t)data->a ^ (size_t)data->b) equal = false; if (data->a && data->b) { for (i = 0; data->a[i] != '\0'; i++) { @@ -65,14 +65,14 @@ static int testStreq(const void *args) if (streq_rv != equal) { virFilePrintf(stderr, "STREQ not working correctly. Expected %d got %d", - (int) equal, (int) streq_rv); + (int)equal, (int)streq_rv); goto cleanup; } if (strneq_rv == equal) { virFilePrintf(stderr, "STRNEQ not working correctly. Expected %d got %d", - (int) equal, (int) strneq_rv); + (int)equal, (int)strneq_rv); goto cleanup; } @@ -225,7 +225,7 @@ static int testRemove(const void *args) for (i = 0; data->tokens[i]; i++) { virStringListRemove(&list, data->tokens[i]); - if (virStringListHasString((const char **) list, data->tokens[i])) { + if (virStringListHasString((const char **)list, data->tokens[i])) { virFilePrintf(stderr, "Not removed %s", data->tokens[i]); goto cleanup; } @@ -564,7 +564,7 @@ struct stringToLongData { * to try and port libvirt to a platform with 16-bit int. Gnulib * already assumes that signed integers are two's complement. */ verify(sizeof(int) == 4); -verify(sizeof(long) == sizeof(int) || sizeof(long) == sizeof(long long)); +verify(sizeof(long) == sizeof(int)|| sizeof(long) == sizeof(long long)); verify(sizeof(long long) == 8); static int @@ -587,7 +587,7 @@ testStringToLong(const void *opaque) do { \ Type value = 5; \ int result; \ - end = (char *) "oops"; \ + end = (char *)"oops"; \ result = virStrToLong_ ## Fn(Str, Suff ? &end : NULL, \ 0, &value); \ /* On failure, end is modified, value is unchanged */ \ diff --git a/tests/virusbmock.c b/tests/virusbmock.c index 12083e236206..e55d051d859b 100644 --- a/tests/virusbmock.c +++ b/tests/virusbmock.c @@ -101,7 +101,7 @@ int open(const char *pathname, int flags, ...) */ if (flags & O_CREAT) { va_start(ap, flags); - mode = (mode_t) va_arg(ap, int); + mode = (mode_t)va_arg(ap, int); va_end(ap); } -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- tools/nss/libvirt_nss.c | 14 +++++++------- tools/virsh-domain-monitor.c | 14 +++++++------- tools/virsh-domain.c | 16 ++++++++-------- tools/virsh-interface.c | 12 ++++++------ tools/virsh-network.c | 10 +++++----- tools/virsh-nodedev.c | 14 +++++++------- tools/virsh-nwfilter.c | 6 +++--- tools/virsh-pool.c | 36 ++++++++++++++++++------------------ tools/virsh-secret.c | 6 +++--- tools/virsh-util.c | 4 ++-- tools/virsh-volume.c | 16 ++++++++-------- tools/virt-admin.c | 4 ++-- tools/vsh.c | 18 +++++++++--------- 13 files changed, 85 insertions(+), 85 deletions(-) diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c index 62fe589bed7e..276a1b85f110 100644 --- a/tools/nss/libvirt_nss.c +++ b/tools/nss/libvirt_nss.c @@ -116,8 +116,8 @@ appendAddr(leaseAddress **tmpAddress, for (i = 0; i < *ntmpAddress; i++) { if (memcmp((*tmpAddress)[i].addr, (family == AF_INET ? - (void *) &sa.data.inet4.sin_addr.s_addr : - (void *) &sa.data.inet6.sin6_addr.s6_addr), + (void *)&sa.data.inet4.sin_addr.s_addr : + (void *)&sa.data.inet6.sin6_addr.s6_addr), FAMILY_ADDRESS_SIZE(family)) == 0) { DEBUG("IP address already in the list"); ret = 0; @@ -133,8 +133,8 @@ appendAddr(leaseAddress **tmpAddress, (*tmpAddress)[*ntmpAddress].af = family; memcpy((*tmpAddress)[*ntmpAddress].addr, (family == AF_INET ? - (void *) &sa.data.inet4.sin_addr.s_addr : - (void *) &sa.data.inet6.sin6_addr.s6_addr), + (void *)&sa.data.inet4.sin_addr.s_addr : + (void *)&sa.data.inet6.sin6_addr.s6_addr), FAMILY_ADDRESS_SIZE(family)); (*ntmpAddress)++; ret = 0; @@ -158,7 +158,7 @@ findLeaseInJSON(leaseAddress **tmpAddress, time_t currtime; int ret = -1; - if ((currtime = time(NULL)) == (time_t) - 1) { + if ((currtime = time(NULL)) == (time_t)- 1) { ERROR("Failed to get current system time"); goto cleanup; } @@ -197,7 +197,7 @@ findLeaseInJSON(leaseAddress **tmpAddress, } /* Do not report expired lease */ - if (expirytime < (long long) currtime) { + if (expirytime < (long long)currtime) { DEBUG("Skipping expired lease for %s", name); continue; } @@ -323,7 +323,7 @@ findLease(const char *name, size_t i; for (i = 0; i < nMacmaps; i++) { - const char **macs = (const char **) virMacMapLookup(macmaps[i], name); + const char **macs = (const char **)virMacMapLookup(macmaps[i], name); if (!macs) continue; diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 8e071779b4ef..e96e05e01732 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1370,7 +1370,7 @@ cmdDomTime(vshControl *ctl, const vshCmd *cmd) } if (doSet || now || rtcSync) { - if (now && ((seconds = time(NULL)) == (time_t) -1)) { + if (now && ((seconds = time(NULL)) == (time_t)-1)) { vshError(ctl, _("Unable to get current time")); goto cleanup; } @@ -1425,11 +1425,11 @@ static const vshCmdInfo info_list[] = { static int virshDomainSorter(const void *a, const void *b) { - virDomainPtr *da = (virDomainPtr *) a; - virDomainPtr *db = (virDomainPtr *) b; + virDomainPtr *da = (virDomainPtr *)a; + virDomainPtr *db = (virDomainPtr *)b; unsigned int ida; unsigned int idb; - unsigned int inactive = (unsigned int) -1; + unsigned int inactive = (unsigned int)-1; if (*da && !*db) return -1; @@ -1541,7 +1541,7 @@ virshDomainListCollect(vshControl *ctl, unsigned int flags) } if (nids) { - ids = vshMalloc(ctl, sizeof(int) * nids); + ids = vshMalloc(ctl, sizeof(int)* nids); if ((nids = virConnectListDomains(priv->conn, ids, nids)) < 0) { vshError(ctl, "%s", _("Failed to list active domains")); @@ -1558,7 +1558,7 @@ virshDomainListCollect(vshControl *ctl, unsigned int flags) } if (nnames) { - names = vshMalloc(ctl, sizeof(char *) * nnames); + names = vshMalloc(ctl, sizeof(char *)* nnames); if ((nnames = virConnectListDefinedDomains(priv->conn, names, nnames)) < 0) { @@ -1851,7 +1851,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd) for (i = 0; i < list->ndomains; i++) { dom = list->domains[i]; id = virDomainGetID(dom); - if (id != (unsigned int) -1) + if (id != (unsigned int)-1) snprintf(id_buf, sizeof(id_buf), "%d", id); else ignore_value(virStrcpyStatic(id_buf, "-")); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2b775fc4cca6..706623039527 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2838,7 +2838,7 @@ cmdBlockresize(vshControl *ctl, const vshCmd *cmd) unsigned int flags = 0; bool ret = false; - if (vshCommandOptStringReq(ctl, cmd, "path", (const char **) &path) < 0) + if (vshCommandOptStringReq(ctl, cmd, "path", (const char **)&path) < 0) return false; if (vshCommandOptScaledInt(ctl, cmd, "size", &size, 1024, ULLONG_MAX) < 0) @@ -5454,7 +5454,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) char *mime = NULL; virshControlPtr priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "file", (const char **) &file) < 0) + if (vshCommandOptStringReq(ctl, cmd, "file", (const char **)&file) < 0) return false; if (vshCommandOptUInt(ctl, cmd, "screen", &screen) < 0) @@ -10826,7 +10826,7 @@ virshMigrateTimeout(vshControl *ctl, virDomainPtr dom, void *opaque) { - virshMigrateTimeoutAction action = *(virshMigrateTimeoutAction *) opaque; + virshMigrateTimeoutAction action = *(virshMigrateTimeoutAction *)opaque; switch (action) { case VIRSH_MIGRATE_TIMEOUT_DEFAULT: /* unreachable */ @@ -11722,8 +11722,8 @@ virshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) attr = n2->properties; while (attr) { if (attr->type == XML_ATTRIBUTE_NODE) { - prop1 = virXMLPropString(n1, (const char *) attr->name); - prop2 = virXMLPropString(n2, (const char *) attr->name); + prop1 = virXMLPropString(n1, (const char *)attr->name); + prop2 = virXMLPropString(n2, (const char *)attr->name); if (STRNEQ_NULLABLE(prop1, prop2)) { xmlFree(prop1); xmlFree(prop2); @@ -12705,7 +12705,7 @@ static const char * virshDomainEventDetailToString(int event, int detail) { const char *str = NULL; - switch ((virDomainEventType) event) { + switch ((virDomainEventType)event) { case VIR_DOMAIN_EVENT_DEFINED: str = virshDomainEventDefinedTypeToString(detail); break; @@ -12905,7 +12905,7 @@ virshEventGenericPrint(virConnectPtr conn ATTRIBUTE_UNUSED, virBuffer buf = VIR_BUFFER_INITIALIZER; virBufferAsprintf(&buf, _("event '%s' for domain %s\n"), - ((virshDomEventData *) opaque)->cb->name, + ((virshDomEventData *)opaque)->cb->name, virDomainGetName(dom)); virshEventPrint(opaque, &buf); } @@ -13036,7 +13036,7 @@ virshEventBlockJobPrint(virConnectPtr conn ATTRIBUTE_UNUSED, virBuffer buf = VIR_BUFFER_INITIALIZER; virBufferAsprintf(&buf, _("event '%s' for domain %s: %s for %s %s\n"), - ((virshDomEventData *) opaque)->cb->name, + ((virshDomEventData *)opaque)->cb->name, virDomainGetName(dom), virshDomainBlockJobToString(type), disk, diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 50518c667be2..7ee683df0e4f 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -155,8 +155,8 @@ cmdInterfaceEdit(vshControl *ctl, const vshCmd *cmd) static int virshInterfaceSorter(const void *a, const void *b) { - virInterfacePtr *ia = (virInterfacePtr *) a; - virInterfacePtr *ib = (virInterfacePtr *) b; + virInterfacePtr *ia = (virInterfacePtr *)a; + virInterfacePtr *ib = (virInterfacePtr *)b; if (*ia && !*ib) return -1; @@ -234,7 +234,7 @@ virshInterfaceListCollect(vshControl *ctl, goto cleanup; } if (nActiveIfaces) { - activeNames = vshMalloc(ctl, sizeof(char *) * nActiveIfaces); + activeNames = vshMalloc(ctl, sizeof(char *)* nActiveIfaces); if ((nActiveIfaces = virConnectListInterfaces(priv->conn, activeNames, nActiveIfaces)) < 0) { @@ -251,7 +251,7 @@ virshInterfaceListCollect(vshControl *ctl, goto cleanup; } if (nInactiveIfaces) { - inactiveNames = vshMalloc(ctl, sizeof(char *) * nInactiveIfaces); + inactiveNames = vshMalloc(ctl, sizeof(char *)* nInactiveIfaces); if ((nInactiveIfaces = virConnectListDefinedInterfaces(priv->conn, inactiveNames, @@ -965,7 +965,7 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) /* br_xml is the new interface to define. It will automatically undefine the * independent original interface. */ - if (!(br_handle = virInterfaceDefineXML(priv->conn, (char *) br_xml, 0))) { + if (!(br_handle = virInterfaceDefineXML(priv->conn, (char *)br_xml, 0))) { vshError(ctl, _("Failed to define new bridge interface %s"), br_name); goto cleanup; @@ -1167,7 +1167,7 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd) /* if_xml is the new interface to define. */ - if (!(if_handle = virInterfaceDefineXML(priv->conn, (char *) if_xml, 0))) { + if (!(if_handle = virInterfaceDefineXML(priv->conn, (char *)if_xml, 0))) { vshError(ctl, _("Failed to define new interface %s"), if_name); goto cleanup; } diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 3f0923bf0ef6..b1809750a05e 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -381,8 +381,8 @@ cmdNetworkInfo(vshControl *ctl, const vshCmd *cmd) static int virshNetworkSorter(const void *a, const void *b) { - virNetworkPtr *na = (virNetworkPtr *) a; - virNetworkPtr *nb = (virNetworkPtr *) b; + virNetworkPtr *na = (virNetworkPtr *)a; + virNetworkPtr *nb = (virNetworkPtr *)b; if (*na && !*nb) return -1; @@ -490,7 +490,7 @@ virshNetworkListCollect(vshControl *ctl, if (nAllNets == 0) return list; - names = vshMalloc(ctl, sizeof(char *) * nAllNets); + names = vshMalloc(ctl, sizeof(char *)* nAllNets); /* Retrieve a list of active network names */ if (!VSH_MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE) || @@ -1320,8 +1320,8 @@ virshNetworkDHCPLeaseSorter(const void *a, const void *b) { int rv = -1; - virNetworkDHCPLeasePtr *lease1 = (virNetworkDHCPLeasePtr *) a; - virNetworkDHCPLeasePtr *lease2 = (virNetworkDHCPLeasePtr *) b; + virNetworkDHCPLeasePtr *lease1 = (virNetworkDHCPLeasePtr *)a; + virNetworkDHCPLeasePtr *lease2 = (virNetworkDHCPLeasePtr *)b; if (*lease1 && !*lease2) return -1; diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index d25fe0e09b44..8a1445bee7ae 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -180,8 +180,8 @@ virshNodeListLookup(int devid, bool parent, void *opaque) static int virshNodeDeviceSorter(const void *a, const void *b) { - virNodeDevicePtr *na = (virNodeDevicePtr *) a; - virNodeDevicePtr *nb = (virNodeDevicePtr *) b; + virNodeDevicePtr *na = (virNodeDevicePtr *)a; + virNodeDevicePtr *nb = (virNodeDevicePtr *)b; if (*na && !*nb) return -1; @@ -260,7 +260,7 @@ virshNodeDeviceListCollect(vshControl *ctl, if (ndevices == 0) return list; - names = vshMalloc(ctl, sizeof(char *) * ndevices); + names = vshMalloc(ctl, sizeof(char *)* ndevices); ndevices = virNodeListDevices(priv->conn, NULL, names, ndevices, 0); if (ndevices < 0) { @@ -298,7 +298,7 @@ virshNodeDeviceListCollect(vshControl *ctl, goto cleanup; } - caps = vshMalloc(ctl, sizeof(char *) * ncaps); + caps = vshMalloc(ctl, sizeof(char *)* ncaps); if ((ncaps = virNodeDeviceListCaps(device, caps, ncaps)) < 0) { vshError(ctl, "%s", _("Failed to get capability names of the device")); @@ -415,7 +415,7 @@ cmdNodeListDevices(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) goto cleanup; } - switch ((virNodeDevCapType) cap_type) { + switch ((virNodeDevCapType)cap_type) { case VIR_NODE_DEV_CAP_SYSTEM: flags |= VIR_CONNECT_LIST_NODE_DEVICES_CAP_SYSTEM; break; @@ -475,8 +475,8 @@ cmdNodeListDevices(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) } if (tree) { - char **parents = vshMalloc(ctl, sizeof(char *) * list->ndevices); - char **names = vshMalloc(ctl, sizeof(char *) * list->ndevices); + char **parents = vshMalloc(ctl, sizeof(char *)* list->ndevices); + char **names = vshMalloc(ctl, sizeof(char *)* list->ndevices); struct virshNodeList arrays = { names, parents }; for (i = 0; i < list->ndevices; i++) diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index 06a002dffdbf..7e75bed849e8 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -211,8 +211,8 @@ cmdNWFilterDumpXML(vshControl *ctl, const vshCmd *cmd) static int virshNWFilterSorter(const void *a, const void *b) { - virNWFilterPtr *fa = (virNWFilterPtr *) a; - virNWFilterPtr *fb = (virNWFilterPtr *) b; + virNWFilterPtr *fa = (virNWFilterPtr *)a; + virNWFilterPtr *fb = (virNWFilterPtr *)b; if (*fa && !*fb) return -1; @@ -291,7 +291,7 @@ virshNWFilterListCollect(vshControl *ctl, if (nfilters == 0) return list; - names = vshMalloc(ctl, sizeof(char *) * nfilters); + names = vshMalloc(ctl, sizeof(char *)* nfilters); nfilters = virConnectListNWFilters(priv->conn, names, nfilters); if (nfilters < 0) { diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 36bf8d9faacb..0a4869a72c6b 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -810,8 +810,8 @@ cmdPoolDumpXML(vshControl *ctl, const vshCmd *cmd) static int virshStoragePoolSorter(const void *a, const void *b) { - virStoragePoolPtr *pa = (virStoragePoolPtr *) a; - virStoragePoolPtr *pb = (virStoragePoolPtr *) b; + virStoragePoolPtr *pa = (virStoragePoolPtr *)a; + virStoragePoolPtr *pb = (virStoragePoolPtr *)b; if (*pa && !*pb) return -1; @@ -925,7 +925,7 @@ virshStoragePoolListCollect(vshControl *ctl, if (nAllPools == 0) return list; - names = vshMalloc(ctl, sizeof(char *) * nAllPools); + names = vshMalloc(ctl, sizeof(char *)* nAllPools); /* Retrieve a list of active storage pool names */ if (!VSH_MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE) || @@ -1184,7 +1184,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) return false; } - switch ((virStoragePoolType) poolType) { + switch ((virStoragePoolType)poolType) { case VIR_STORAGE_POOL_DIR: flags |= VIR_CONNECT_LIST_STORAGE_POOLS_DIR; break; @@ -1430,32 +1430,32 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* Display the string lengths for debugging. */ vshDebug(ctl, VSH_ERR_DEBUG, "Longest name string = %lu chars\n", - (unsigned long) nameStrLength); + (unsigned long)nameStrLength); vshDebug(ctl, VSH_ERR_DEBUG, "Longest state string = %lu chars\n", - (unsigned long) stateStrLength); + (unsigned long)stateStrLength); vshDebug(ctl, VSH_ERR_DEBUG, "Longest autostart string = %lu chars\n", - (unsigned long) autostartStrLength); + (unsigned long)autostartStrLength); vshDebug(ctl, VSH_ERR_DEBUG, "Longest persistent string = %lu chars\n", - (unsigned long) persistStrLength); + (unsigned long)persistStrLength); vshDebug(ctl, VSH_ERR_DEBUG, "Longest capacity string = %lu chars\n", - (unsigned long) capStrLength); + (unsigned long)capStrLength); vshDebug(ctl, VSH_ERR_DEBUG, "Longest allocation string = %lu chars\n", - (unsigned long) allocStrLength); + (unsigned long)allocStrLength); vshDebug(ctl, VSH_ERR_DEBUG, "Longest available string = %lu chars\n", - (unsigned long) availStrLength); + (unsigned long)availStrLength); /* Create the output template. Each column is sized according to * the longest string. */ if (virAsprintf(&outputStr, " %%-%lus %%-%lus %%-%lus %%-%lus %%%lus %%%lus %%%lus\n", - (unsigned long) nameStrLength, - (unsigned long) stateStrLength, - (unsigned long) autostartStrLength, - (unsigned long) persistStrLength, - (unsigned long) capStrLength, - (unsigned long) allocStrLength, - (unsigned long) availStrLength) < 0) + (unsigned long)nameStrLength, + (unsigned long)stateStrLength, + (unsigned long)autostartStrLength, + (unsigned long)persistStrLength, + (unsigned long)capStrLength, + (unsigned long)allocStrLength, + (unsigned long)availStrLength) < 0) goto cleanup; /* Display the header */ diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 9e4ec61a8807..55b35f5b9bce 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -332,8 +332,8 @@ cmdSecretUndefine(vshControl *ctl, const vshCmd *cmd) static int virshSecretSorter(const void *a, const void *b) { - virSecretPtr *sa = (virSecretPtr *) a; - virSecretPtr *sb = (virSecretPtr *) b; + virSecretPtr *sa = (virSecretPtr *)a; + virSecretPtr *sb = (virSecretPtr *)b; char uuid_sa[VIR_UUID_STRING_BUFLEN]; char uuid_sb[VIR_UUID_STRING_BUFLEN]; @@ -419,7 +419,7 @@ virshSecretListCollect(vshControl *ctl, if (nsecrets == 0) return list; - uuids = vshMalloc(ctl, sizeof(char *) * nsecrets); + uuids = vshMalloc(ctl, sizeof(char *)* nsecrets); nsecrets = virConnectListSecrets(priv->conn, uuids, nsecrets); if (nsecrets < 0) { diff --git a/tools/virsh-util.c b/tools/virsh-util.c index 44be3ad64b1f..a1bcab5de3f5 100644 --- a/tools/virsh-util.c +++ b/tools/virsh-util.c @@ -175,7 +175,7 @@ virshStreamSourceSkip(virStreamPtr st ATTRIBUTE_UNUSED, int fd = cbData->fd; off_t cur; - if ((cur = lseek(fd, offset, SEEK_CUR)) == (off_t) -1) + if ((cur = lseek(fd, offset, SEEK_CUR)) == (off_t)-1) return -1; return 0; @@ -190,7 +190,7 @@ virshStreamSkip(virStreamPtr st ATTRIBUTE_UNUSED, int *fd = opaque; off_t cur; - if ((cur = lseek(*fd, offset, SEEK_CUR)) == (off_t) -1) + if ((cur = lseek(*fd, offset, SEEK_CUR)) == (off_t)-1) return -1; if (ftruncate(*fd, cur) < 0) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 9d6ebd2325a5..0bfc7c344b1e 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -617,7 +617,7 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - newvol = virStorageVolCreateXMLFrom(origpool, (char *) newxml, origvol, flags); + newvol = virStorageVolCreateXMLFrom(origpool, (char *)newxml, origvol, flags); if (newvol != NULL) { vshPrintExtra(ctl, _("Vol %s cloned from %s\n"), @@ -1235,8 +1235,8 @@ cmdVolDumpXML(vshControl *ctl, const vshCmd *cmd) static int virshStorageVolSorter(const void *a, const void *b) { - virStorageVolPtr *va = (virStorageVolPtr *) a; - virStorageVolPtr *vb = (virStorageVolPtr *) b; + virStorageVolPtr *va = (virStorageVolPtr *)a; + virStorageVolPtr *vb = (virStorageVolPtr *)b; if (*va && !*vb) return -1; @@ -1542,11 +1542,11 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if (virAsprintf(&outputStr, " %%-%lus %%-%lus %%-%lus %%%lus %%%lus\n", - (unsigned long) nameStrLength, - (unsigned long) pathStrLength, - (unsigned long) typeStrLength, - (unsigned long) capStrLength, - (unsigned long) allocStrLength) < 0) + (unsigned long)nameStrLength, + (unsigned long)pathStrLength, + (unsigned long)typeStrLength, + (unsigned long)capStrLength, + (unsigned long)allocStrLength) < 0) goto cleanup; /* Display the header */ diff --git a/tools/virt-admin.c b/tools/virt-admin.c index c86b5763a73c..efc4f7a940da 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -1014,7 +1014,7 @@ cmdDaemonLogFilters(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "filters")) { if ((vshCommandOptStringReq(ctl, cmd, "filters", - (const char **) &filters) < 0 || + (const char **)&filters) < 0 || virAdmConnectSetLoggingFilters(priv->conn, filters, 0) < 0)) { vshError(ctl, _("Unable to change daemon logging settings")); return false; @@ -1068,7 +1068,7 @@ cmdDaemonLogOutputs(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "outputs")) { if ((vshCommandOptStringReq(ctl, cmd, "outputs", - (const char **) &outputs) < 0 || + (const char **)&outputs) < 0 || virAdmConnectSetLoggingOutputs(priv->conn, outputs, 0) < 0)) { vshError(ctl, _("Unable to change daemon logging settings")); return false; diff --git a/tools/vsh.c b/tools/vsh.c index 73ec007e5622..ae4cd6ae48f7 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -136,7 +136,7 @@ _vshMalloc(vshControl *ctl, size_t size, const char *filename, int line) if (VIR_ALLOC_N(x, size) == 0) return x; vshError(ctl, _("%s: %d: failed to allocate %d bytes"), - filename, line, (int) size); + filename, line, (int)size); exit(EXIT_FAILURE); } @@ -150,7 +150,7 @@ _vshCalloc(vshControl *ctl, size_t nmemb, size_t size, const char *filename, VIR_ALLOC_N(x, nmemb * size) == 0) return x; vshError(ctl, _("%s: %d: failed to allocate %d bytes"), - filename, line, (int) (size*nmemb)); + filename, line, (int)(size*nmemb)); exit(EXIT_FAILURE); } @@ -1759,7 +1759,7 @@ vshCommandOptTimeoutToMs(vshControl *ctl, const vshCmd *cmd, int *timeout) "timeout"); ret = -1; } else { - *timeout = ((int) utimeout) * 1000; + *timeout = ((int)utimeout) * 1000; } return ret; @@ -2232,7 +2232,7 @@ vshOutputLogFile(vshControl *ctl, int log_level, const char *msg_format, stTm.tm_min, stTm.tm_sec, ctl->progname, - (int) getpid()); + (int)getpid()); switch (log_level) { case VSH_ERR_DEBUG: lvl = LVL_DEBUG; @@ -2754,7 +2754,7 @@ vshCompleterFilter(char ***list, if (!list || !*list) return -1; - list_len = virStringListLength((const char **) *list); + list_len = virStringListLength((const char **)*list); if (VIR_ALLOC_N(newList, list_len + 1) < 0) return -1; @@ -2916,7 +2916,7 @@ vshReadlineInit(vshControl *ctl) # if defined(RL_READLINE_VERSION) && RL_READLINE_VERSION > 0x0402 rl_readline_name = ctl->name; # else - rl_readline_name = (char *) ctl->name; + rl_readline_name = (char *)ctl->name; # endif /* Tell the completer that we want a crack first. */ @@ -2925,15 +2925,15 @@ vshReadlineInit(vshControl *ctl) # if defined(RL_READLINE_VERSION) && RL_READLINE_VERSION > 0x0402 rl_basic_word_break_characters = break_characters; # else - rl_basic_word_break_characters = (char *) break_characters; + rl_basic_word_break_characters = (char *)break_characters; # endif # if defined(RL_READLINE_VERSION) && RL_READLINE_VERSION > 0x0402 rl_completer_quote_characters = quote_characters; rl_char_is_quoted_p = vshReadlineCharIsQuoted; # else - rl_completer_quote_characters = (char *) quote_characters; - rl_char_is_quoted_p = (Function *) vshReadlineCharIsQuoted; + rl_completer_quote_characters = (char *)quote_characters; + rl_char_is_quoted_p = (Function *)vshReadlineCharIsQuoted; # endif if (virAsprintf(&histsize_env, "%s_HISTSIZE", ctl->env_prefix) < 0) -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/internal.h | 4 ++-- src/libvirt-domain.c | 4 ++-- src/libvirt-host.c | 2 +- src/libvirt-lxc.c | 4 ++-- src/libvirt-stream.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/internal.h b/src/internal.h index 47ff0479d232..f81bc765d750 100644 --- a/src/internal.h +++ b/src/internal.h @@ -496,8 +496,8 @@ /* Round up to the next closest power of 2. It will return rounded number or 0 * for 0 or number more than 2^31 (for 32bit unsigned int). */ # define VIR_ROUND_UP_POWER_OF_TWO(value) \ - ((value) > 0 && (value) <= 1U << (sizeof(unsigned int) * 8 - 1) ? \ - 1U << (sizeof(unsigned int) * 8 - count_leading_zeros((value) - 1)) : 0) + ((value) > 0 && (value) <= 1U << (sizeof(unsigned int)* 8 - 1) ? \ + 1U << (sizeof(unsigned int)* 8 - count_leading_zeros((value) - 1)) : 0) /* Specific error values for use in forwarding programs such as diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 2d86e48979d3..2a29e217c8c9 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -1719,7 +1719,7 @@ virDomainGetUUIDString(virDomainPtr domain, char *buf) * * Get the hypervisor ID number for the domain * - * Returns the domain ID number or (unsigned int) -1 in case of error + * Returns the domain ID number or (unsigned int)-1 in case of error */ unsigned int virDomainGetID(virDomainPtr domain) @@ -1799,7 +1799,7 @@ virDomainGetMaxMemory(virDomainPtr domain) ret = conn->driver->domainGetMaxMemory(domain); if (ret == 0) goto error; - if ((unsigned long) ret != ret) { + if ((unsigned long)ret != ret) { virReportError(VIR_ERR_OVERFLOW, _("result too large: %llu"), ret); goto error; diff --git a/src/libvirt-host.c b/src/libvirt-host.c index 76087badd8e3..5534c96fa7c7 100644 --- a/src/libvirt-host.c +++ b/src/libvirt-host.c @@ -1348,7 +1348,7 @@ virNodeGetCPUMap(virConnectPtr conn, * int startcell = 0; * unsigned int cellcount = 2; * - * unsigned long long counts = malloc(sizeof(long long) * npages * cellcount); + * unsigned long long counts = malloc(sizeof(long long)* npages * cellcount); * * virNodeGetFreePages(conn, pages, npages, * startcell, cellcount, counts, 0); diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c index c9f2146487d6..f5db8027f1a4 100644 --- a/src/libvirt-lxc.c +++ b/src/libvirt-lxc.c @@ -215,7 +215,7 @@ virDomainLxcEnterSecurityLabel(virSecurityModelPtr model, goto error; } - if (strlen((char *) ctx) >= VIR_SECURITY_LABEL_BUFLEN) { + if (strlen((char *)ctx) >= VIR_SECURITY_LABEL_BUFLEN) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label exceeds " "maximum length: %d"), @@ -224,7 +224,7 @@ virDomainLxcEnterSecurityLabel(virSecurityModelPtr model, goto error; } - strcpy(oldlabel->label, (char *) ctx); + strcpy(oldlabel->label, (char *)ctx); freecon(ctx); if ((oldlabel->enforcing = security_getenforce()) < 0) { diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c index ef83696bcda7..3b829217a3d9 100644 --- a/src/libvirt-stream.c +++ b/src/libvirt-stream.c @@ -659,7 +659,7 @@ virStreamSendAll(virStreamPtr stream, * int myskip(virStreamPtr st, long long offset, void *opaque) { * int *fd = opaque; * - * return lseek(*fd, offset, SEEK_CUR) == (off_t) -1 ? -1 : 0; + * return lseek(*fd, offset, SEEK_CUR) == (off_t)-1 ? -1 : 0; * } * * int myindata(virStreamPtr st, int *inData, @@ -938,7 +938,7 @@ virStreamRecvAll(virStreamPtr stream, * int myskip(virStreamPtr st, long long offset, void *opaque) { * int *fd = opaque; * - * return lseek(*fd, offset, SEEK_CUR) == (off_t) -1 ? -1 : 0; + * return lseek(*fd, offset, SEEK_CUR) == (off_t)-1 ? -1 : 0; * } * * virStreamPtr st = virStreamNew(conn, 0); -- 2.17.0
On Wed, 2018-04-25 at 15:25 +0200, Martin Kletzander wrote:
/* Round up to the next closest power of 2. It will return rounded number or 0 * for 0 or number more than 2^31 (for 32bit unsigned int). */ # define VIR_ROUND_UP_POWER_OF_TWO(value) \ - ((value) > 0 && (value) <= 1U << (sizeof(unsigned int) * 8 - 1) ? \ - 1U << (sizeof(unsigned int) * 8 - count_leading_zeros((value) - 1)) : 0) + ((value) > 0 && (value) <= 1U << (sizeof(unsigned int)* 8 - 1) ? \ + 1U << (sizeof(unsigned int)* 8 - count_leading_zeros((value) - 1)) : 0)
These are clearly wrong. You're going to have to tune your regex so that it doesn't mistake sizeof() invocations for casts. -- Andrea Bolognani / Red Hat / Virtualization
On Wed, Apr 25, 2018 at 03:25:06PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/internal.h | 4 ++-- src/libvirt-domain.c | 4 ++-- src/libvirt-host.c | 2 +- src/libvirt-lxc.c | 4 ++-- src/libvirt-stream.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/internal.h b/src/internal.h index 47ff0479d232..f81bc765d750 100644 --- a/src/internal.h +++ b/src/internal.h @@ -496,8 +496,8 @@ /* Round up to the next closest power of 2. It will return rounded number or 0 * for 0 or number more than 2^31 (for 32bit unsigned int). */ # define VIR_ROUND_UP_POWER_OF_TWO(value) \ - ((value) > 0 && (value) <= 1U << (sizeof(unsigned int) * 8 - 1) ? \ - 1U << (sizeof(unsigned int) * 8 - count_leading_zeros((value) - 1)) : 0) + ((value) > 0 && (value) <= 1U << (sizeof(unsigned int)* 8 - 1) ? \ + 1U << (sizeof(unsigned int)* 8 - count_leading_zeros((value) - 1)) : 0)
This is not a cast.
/* Specific error values for use in forwarding programs such as
diff --git a/src/libvirt-host.c b/src/libvirt-host.c index 76087badd8e3..5534c96fa7c7 100644 --- a/src/libvirt-host.c +++ b/src/libvirt-host.c @@ -1348,7 +1348,7 @@ virNodeGetCPUMap(virConnectPtr conn, * int startcell = 0; * unsigned int cellcount = 2; * - * unsigned long long counts = malloc(sizeof(long long) * npages * cellcount); + * unsigned long long counts = malloc(sizeof(long long)* npages * cellcount); *
Neither is this.
* virNodeGetFreePages(conn, pages, npages, * startcell, cellcount, counts, 0);
Jano
Let's make a rule out of it and document it. Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- cfg.mk | 6 ++++++ docs/hacking.html.in | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/cfg.mk b/cfg.mk index 902178dd1c3a..5f75338aac04 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1050,6 +1050,12 @@ sc_prohibit_backslash_alignment: halt='Do not attempt to right-align backslashes' \ $(_sc_search_regexp) +sc_prohibit_space_after_cast: + @prohibit='(\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|[a-zA-Z]+_t|void|struct) ?)+|switch \(\(vir[a-zA-Z]*Type)\)[[:space:]]+([^ );,{=\\A-Z])' \ + in_vc_files='*\.[chx]$$' \ + halt='Do not use space after cast' \ + $(_sc_search_regexp) + # We don't use this feature of maint.mk. prev_version_file = /dev/null diff --git a/docs/hacking.html.in b/docs/hacking.html.in index fbeea3eb751d..bf6f80c0d217 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -579,6 +579,15 @@ int foo(int wizz); // Good </pre> + <p> + There must not be any whitespace immediately following a cast to any + type. E.g. + </p> + <pre> + foo = (int) bar; // Bad + foo = (int)bar; // Good +</pre> + <h2><a id="comma">Commas</a></h2> <p> -- 2.17.0
On Wed, Apr 25, 2018 at 03:25:07PM +0200, Martin Kletzander wrote:
Let's make a rule out of it and document it.
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- cfg.mk | 6 ++++++ docs/hacking.html.in | 9 +++++++++ 2 files changed, 15 insertions(+)
diff --git a/cfg.mk b/cfg.mk index 902178dd1c3a..5f75338aac04 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1050,6 +1050,12 @@ sc_prohibit_backslash_alignment: halt='Do not attempt to right-align backslashes' \ $(_sc_search_regexp)
+sc_prohibit_space_after_cast: + @prohibit='(\([a-zA-Z _]+ \*+
Both this
|\(((signed|unsigned|long|short|int|char|
[a-zA-Z]+_t
and this should include numbers to catch types like uint64_t
|void|struct) ?)+|switch \(\(vir[a-zA-Z]*Type)\)[[:space:]]+
([^ );,{=\\A-Z])' \
Allowing 'A-Z' here misses some cases of casting NULL and some macros. The false positives include function declarations from vbox_CAPI header files and our one-line helpers with no arguments and some ATTRIBUTE_ marker. Since any attempts to parse C with a regex will have some limitations, I'd just drop 'void' from the list of types in the first part, since we don't need to use it that often - only the hal driver and the viratomic macros use it as ignore_value. Jano
+ in_vc_files='*\.[chx]$$' \ + halt='Do not use space after cast' \ + $(_sc_search_regexp) + # We don't use this feature of maint.mk. prev_version_file = /dev/null
diff --git a/docs/hacking.html.in b/docs/hacking.html.in index fbeea3eb751d..bf6f80c0d217 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -579,6 +579,15 @@ int foo(int wizz); // Good </pre>
+ <p> + There must not be any whitespace immediately following a cast to any + type. E.g. + </p> + <pre> + foo = (int) bar; // Bad + foo = (int)bar; // Good +</pre> + <h2><a id="comma">Commas</a></h2>
<p> -- 2.17.0
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Wed, 2018-04-25 at 15:24 +0200, Martin Kletzander wrote:
According to previous discussions it looks like this is the preferred way of casting. One difference to the previous one is that this time I tuned the regexp a bit so that it doesn't match some macros and assignments and it also matches structs.
I was quite surprised, while reviewing some code, that an obvious case of "space after cast" was not being caught by syntax-check; a bit of digging made me realize that this series was never fully merged, with the syntax-check part notably still missing. Do you have any plans to pick this up again? -- Andrea Bolognani / Red Hat / Virtualization
On Thu, Oct 11, 2018 at 10:20:34AM +0200, Andrea Bolognani wrote:
On Wed, 2018-04-25 at 15:24 +0200, Martin Kletzander wrote:
According to previous discussions it looks like this is the preferred way of casting. One difference to the previous one is that this time I tuned the regexp a bit so that it doesn't match some macros and assignments and it also matches structs.
I was quite surprised, while reviewing some code, that an obvious case of "space after cast" was not being caught by syntax-check; a bit of digging made me realize that this series was never fully merged, with the syntax-check part notably still missing.
Do you have any plans to pick this up again?
Some changes needed to be done and I have done the change locally, I remember, but then I don't seem to recall if I found yet another problem with it or just ran out of the backside of a particular rodent to hand out. I can have a look and try to repost if you'd like.
-- Andrea Bolognani / Red Hat / Virtualization
On Thu, 2018-10-11 at 10:45 +0200, Martin Kletzander wrote:
On Thu, Oct 11, 2018 at 10:20:34AM +0200, Andrea Bolognani wrote:
I was quite surprised, while reviewing some code, that an obvious case of "space after cast" was not being caught by syntax-check; a bit of digging made me realize that this series was never fully merged, with the syntax-check part notably still missing.
Do you have any plans to pick this up again?
Some changes needed to be done and I have done the change locally, I remember, but then I don't seem to recall if I found yet another problem with it or just ran out of the backside of a particular rodent to hand out. I can have a look and try to repost if you'd like.
Consider my message a polite reminder of the fact that the series was not fully merged and then act on that information, or not, as you see fit :) -- Andrea Bolognani / Red Hat / Virtualization
participants (3)
-
Andrea Bolognani -
Ján Tomko -
Martin Kletzander