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

util: Move error messages onto a single line

Browse Source 
Error messages are exempt from the 80 columns rule. Move them
onto one line.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Michal Privoznik 2023-08-24 17:03:59 +02:00
parent 67a89930c0
commit c34d9cb9ce
18 changed files with 33 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/util/vircgroupv2devices.c
View File

@ -444,9 +444,7 @@ virCgroupV2DevicesCreateMap(size_t size)
if (mapfd < 0) {
if (errno == EPERM) {
virReportSystemError(errno, "%s",
_("failed to initialize device BPF map; "
"locked memory limit for libvirtd probably "
"needs to be raised"));
_("failed to initialize device BPF map; locked memory limit for libvirtd probably needs to be raised"));
return -1;
} else {
virReportSystemError(errno, "%s",
@ -595,8 +593,7 @@ int
virCgroupV2DevicesDetectProg(virCgroup *group G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("cgroups v2 BPF devices not supported "
"with this kernel"));
_("cgroups v2 BPF devices not supported with this kernel"));
return -1;
}
@ -605,8 +602,7 @@ int
virCgroupV2DevicesCreateProg(virCgroup *group G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("cgroups v2 BPF devices not supported "
"with this kernel"));
_("cgroups v2 BPF devices not supported with this kernel"));
return -1;
}
@ -615,8 +611,7 @@ int
virCgroupV2DevicesPrepareProg(virCgroup *group G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("cgroups v2 BPF devices not supported "
"with this kernel"));
_("cgroups v2 BPF devices not supported with this kernel"));
return -1;
}

3
src/util/vircommand.c
View File

@ -2691,8 +2691,7 @@ virCommandRunAsync(virCommand *cmd, pid_t *pid)
virCommandDoAsyncIOHelper,
"cmd-async-io", false, cmd) < 0) {
virReportSystemError(errno, "%s",
_("Unable to create thread "
"to process command's IO"));
_("Unable to create thread to process command's IO"));
VIR_FREE(cmd->asyncioThread);
virCommandAbort(cmd);
ret = -1;

3
src/util/virfile.c
View File

@ -1094,8 +1094,7 @@ virFileNBDLoadDriver(void)
{
if (virKModIsProhibited(NBD_DRIVER)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to load nbd module: "
"administratively prohibited"));
_("Failed to load nbd module: administratively prohibited"));
return false;
} else {
g_autofree char *errbuf = NULL;

3
src/util/virhostcpu.c
View File

@ -892,8 +892,7 @@ virHostCPUStatsAssign(virNodeCPUStatsPtr param,
{
if (virStrcpyStatic(param->field, name) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("kernel cpu time field is too long"
" for the destination"));
"%s", _("kernel cpu time field is too long for the destination"));
return -1;
}
param->value = value;

6
src/util/virhostmem.c
View File

@ -392,8 +392,7 @@ virHostMemSetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
virCheckFlags(0, -1);
virReportError(VIR_ERR_NO_SUPPORT, "%s",
_("node set memory parameters not implemented"
" on this platform"));
_("node set memory parameters not implemented on this platform"));
return -1;
}
#endif
@ -586,8 +585,7 @@ virHostMemGetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
virReportError(VIR_ERR_NO_SUPPORT, "%s",
_("node get memory parameters not implemented"
" on this platform"));
_("node get memory parameters not implemented on this platform"));
return -1;
}
#endif

3
src/util/virjson.c
View File

@ -1938,8 +1938,7 @@ virJSONValueObjectDeflattenWorker(const char *key,
} else {
if (!virJSONValueIsObject(existobj)) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("mixing nested objects and values is forbidden in "
"JSON deflattening"));
_("mixing nested objects and values is forbidden in JSON deflattening"));
return -1;
}
}

3
src/util/virmdev.c
View File

@ -167,8 +167,7 @@ virMediatedDeviceNew(const char *uuidstr G_GNUC_UNUSED,
virMediatedDeviceModelType model G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("mediated devices are not supported on non-linux "
"platforms"));
_("mediated devices are not supported on non-linux platforms"));
return NULL;
}

12
src/util/virnetdev.c
View File

@ -182,8 +182,7 @@ virNetDevSetupControl(const char *ifname G_GNUC_UNUSED,
void *ifr G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Network device configuration is not supported "
"on this platform"));
_("Network device configuration is not supported on this platform"));
return -1;
}
#endif /* WITH_STRUCT_IFREQ */
@ -2248,8 +2247,7 @@ virNetDevSetNetConfig(const char *linkdev, int vf,
if (vlan) {
if (vlan->nTags != 1 || vlan->trunk) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("vlan trunking is not supported "
"by SR-IOV network devices"));
_("vlan trunking is not supported by SR-IOV network devices"));
return -1;
}
@ -2651,8 +2649,7 @@ int virNetDevAddMulti(const char *ifname G_GNUC_UNUSED,
virMacAddr *macaddr G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to add address to interface "
"multicast list on this platform"));
_("Unable to add address to interface multicast list on this platform"));
return -1;
}
#endif
@ -2696,8 +2693,7 @@ int virNetDevDelMulti(const char *ifname G_GNUC_UNUSED,
virMacAddr *macaddr G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to delete address from interface "
"multicast list on this platform"));
_("Unable to delete address from interface multicast list on this platform"));
return -1;
}
#endif

6
src/util/virnetdevbandwidth.c
View File

@ -208,15 +208,13 @@ virNetDevBandwidthSet(const char *ifname,
if (geteuid() != 0) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("Network bandwidth tuning is not available"
" in session mode"));
_("Network bandwidth tuning is not available in session mode"));
return -1;
}
if (!ifname) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("Unable to set bandwidth for interface because "
"device name is unknown"));
_("Unable to set bandwidth for interface because device name is unknown"));
return -1;
}

6
src/util/virnetdevopenvswitch.c
View File

@ -894,15 +894,13 @@ virNetDevOpenvswitchInterfaceSetQos(const char *ifname,
if (geteuid() != 0) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("Network bandwidth tuning is not available"
" in session mode"));
_("Network bandwidth tuning is not available in session mode"));
return -1;
}
if (!ifname) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("Unable to set bandwidth for interface because "
"device name is unknown"));
_("Unable to set bandwidth for interface because device name is unknown"));
return -1;
}

6
src/util/virnetdevvportprofile.c
View File

@ -530,8 +530,7 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, int32_t vf,
if (nla_type(tb_vf_ports) != IFLA_VF_PORT) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("error while iterating over "
"IFLA_VF_PORTS part"));
_("error while iterating over IFLA_VF_PORTS part"));
return -1;
}
@ -584,8 +583,7 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, int32_t vf,
if (nla_parse_nested(tb_port, IFLA_PORT_MAX, tb_vf_ports,
ifla_port_policy)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("error parsing IFLA_VF_PORT "
"during error reporting"));
_("error parsing IFLA_VF_PORT during error reporting"));
return -1;
}
if (tb_port[IFLA_PORT_INSTANCE_UUID]) {

3
src/util/virnetlink.c
View File

@ -225,8 +225,7 @@ virNetlinkCreateSocket(int protocol)
if (virNetlinkSetBufferSize(nlhandle, 131702, 0) < 0) {
virReportSystemError(errno, "%s",
_("cannot set netlink socket buffer "
"size to 128k"));
_("cannot set netlink socket buffer size to 128k"));
goto error;
}
nl_socket_enable_msg_peek(nlhandle);

6
src/util/virnuma.c
View File

@ -69,8 +69,7 @@ virNumaGetAutoPlacementAdvice(unsigned short vcpus,
if (virCommandRun(cmd, NULL) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("Failed to query numad for the "
"advisory nodeset"));
_("Failed to query numad for the advisory nodeset"));
VIR_FREE(output);
}
@ -149,8 +148,7 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode,
if (!has_preferred_many && nnodes != 1) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("NUMA memory tuning in 'preferred' mode "
"only supports single node"));
"%s", _("NUMA memory tuning in 'preferred' mode only supports single node"));
return -1;
}

3
src/util/virpci.c
View File

@ -1454,8 +1454,7 @@ virPCIDeviceAddressIsValid(virPCIDeviceAddress *addr,
if (virPCIDeviceAddressIsEmpty(addr)) {
if (report)
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Invalid PCI address 0000:00:00, at least "
"one of domain, bus, or slot must be > 0"));
_("Invalid PCI address 0000:00:00, at least one of domain, bus, or slot must be > 0"));
return false;
}
return true;

9
src/util/virprocess.c
View File

@ -1638,15 +1638,13 @@ virProcessSetScheduler(pid_t pid,
if ((min = sched_get_priority_min(pol)) < 0) {
virReportSystemError(errno, "%s",
_("Cannot get minimum scheduler "
"priority value"));
_("Cannot get minimum scheduler priority value"));
return -1;
}
if ((max = sched_get_priority_max(pol)) < 0) {
virReportSystemError(errno, "%s",
_("Cannot get maximum scheduler "
"priority value"));
_("Cannot get maximum scheduler priority value"));
return -1;
}
@ -1681,8 +1679,7 @@ virProcessSetScheduler(pid_t pid G_GNUC_UNUSED,
return 0;
virReportSystemError(ENOSYS, "%s",
_("Process CPU scheduling is not supported "
"on this platform"));
_("Process CPU scheduling is not supported on this platform"));
return -1;
}

3
src/util/virqemu.c
View File

@ -207,8 +207,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
case VIR_JSON_TYPE_ARRAY:
if (nested) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("nested JSON array to commandline conversion is "
"not supported"));
_("nested JSON array to commandline conversion is not supported"));
return -1;
}

9
src/util/virresctrl.c
View File

@ -496,8 +496,7 @@ static int
virResctrlLock(void)
{
virReportSystemError(ENOSYS, "%s",
_("resctrl locking is not supported "
"on this platform"));
_("resctrl locking is not supported on this platform"));
return -1;
}
@ -506,8 +505,7 @@ static int
virResctrlUnlock(int fd G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("resctrl locking is not supported "
"on this platform"));
_("resctrl locking is not supported on this platform"));
return -1;
}
@ -1468,8 +1466,7 @@ virResctrlAllocParseMemoryBandwidthLine(virResctrlInfo *resctrl,
!resctrl->membw_info->min_bandwidth ||
!resctrl->membw_info->bandwidth_granularity) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Missing or inconsistent resctrl info for "
"memory bandwidth allocation"));
_("Missing or inconsistent resctrl info for memory bandwidth allocation"));
return -1;
}

3
src/util/virthreadpool.c
View File

@ -429,8 +429,7 @@ virThreadPoolSetParameters(virThreadPool *pool,
if ((maxWorkers == 0 && pool->maxWorkers > 0) ||
(maxWorkers > 0 && pool->maxWorkers == 0)) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("maxWorkers must not be switched from zero to non-zero"
" and vice versa"));
_("maxWorkers must not be switched from zero to non-zero and vice versa"));
return -1;
}