External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-07 18:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

network: 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-25 09:15:37 +02:00
parent 8e48b9a313
commit b0daf7fa7c
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/bridge_driver.c
View File

@ -1302,8 +1302,7 @@ networkDnsmasqConfContents(virNetworkObj *obj,
if (ipdef->nranges || ipdef->nhosts) { if (ipdef->nranges || ipdef->nhosts) {
if (ipv4def) { if (ipv4def) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("For IPv4, multiple DHCP definitions " _("For IPv4, multiple DHCP definitions cannot be specified."));
"cannot be specified."));
return -1; return -1;
} else { } else {
ipv4def = ipdef; ipv4def = ipdef;
@ -1316,8 +1315,7 @@ networkDnsmasqConfContents(virNetworkObj *obj,
if (ipdef->nranges || ipdef->nhosts) { if (ipdef->nranges || ipdef->nhosts) {
if (ipv6def) { if (ipv6def) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("For IPv6, multiple DHCP definitions " _("For IPv6, multiple DHCP definitions cannot be specified."));
"cannot be specified."));
return -1; return -1;
} else { } else {
ipv6def = ipdef; ipv6def = ipdef;
@ -2869,9 +2867,7 @@ networkValidate(virNetworkDriverState *driver,
if (ipdef->nranges || ipdef->nhosts) { if (ipdef->nranges || ipdef->nhosts) {
if (ipv4def) { if (ipv4def) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Multiple IPv4 dhcp sections found -- " _("Multiple IPv4 dhcp sections found -- dhcp is supported only for a single IPv4 address on each network"));
"dhcp is supported only for a "
"single IPv4 address on each network"));
return -1; return -1;
} else { } else {
ipv4def = true; ipv4def = true;
@ -2882,9 +2878,7 @@ networkValidate(virNetworkDriverState *driver,
if (ipdef->nranges || ipdef->nhosts) { if (ipdef->nranges || ipdef->nhosts) {
if (ipv6def) { if (ipv6def) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Multiple IPv6 dhcp sections found -- " _("Multiple IPv6 dhcp sections found -- dhcp is supported only for a single IPv6 address on each network"));
"dhcp is supported only for a "
"single IPv6 address on each network"));
return -1; return -1;
} else { } else {
ipv6def = true; ipv6def = true;

10
src/network/bridge_driver_linux.c
View File

@ -884,15 +884,7 @@ int networkAddFirewallRules(virNetworkDef *def)
if (version >= 6000 && if (version >= 6000 &&
virFirewallDGetBackend() == VIR_FIREWALLD_BACKEND_NFTABLES) { virFirewallDGetBackend() == VIR_FIREWALLD_BACKEND_NFTABLES) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("firewalld is set to use the nftables " _("firewalld is set to use the nftables backend, but the required firewalld 'libvirt' zone is missing. Either set the firewalld backend to 'iptables', or ensure that firewalld has a 'libvirt' zone by upgrading firewalld to a version supporting rule priorities (0.7.0+) and/or rebuilding libvirt with --with-firewalld-zone"));
"backend, but the required firewalld "
"'libvirt' zone is missing. Either set "
"the firewalld backend to 'iptables', or "
"ensure that firewalld has a 'libvirt' "
"zone by upgrading firewalld to a "
"version supporting rule priorities "
"(0.7.0+) and/or rebuilding "
"libvirt with --with-firewalld-zone"));
return -1; return -1;
} }
} }