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

src: 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:04:13 +02:00
parent 094d1e739d
commit d918ac2977
2 changed files with 19 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/libvirt-domain.c
View File

@ -3569,8 +3569,7 @@ virDomainMigrateUnmanagedProto2(virDomainPtr domain,
if (!virTypedParamsCheck(params, nparams, compatParams, if (!virTypedParamsCheck(params, nparams, compatParams,
G_N_ELEMENTS(compatParams))) { G_N_ELEMENTS(compatParams))) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("Some parameters are not supported by migration " _("Some parameters are not supported by migration protocol 2"));
"protocol 2"));
return -1; return -1;
} }
@ -3618,8 +3617,7 @@ virDomainMigrateUnmanagedProto3(virDomainPtr domain,
if (!virTypedParamsCheck(params, nparams, compatParams, if (!virTypedParamsCheck(params, nparams, compatParams,
G_N_ELEMENTS(compatParams))) { G_N_ELEMENTS(compatParams))) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("Some parameters are not supported by migration " _("Some parameters are not supported by migration protocol 3"));
"protocol 3"));
return -1; return -1;
} }
@ -3822,8 +3820,7 @@ virDomainMigrate(virDomainPtr domain,
if (rc <= 0) { if (rc <= 0) {
if (rc == 0) if (rc == 0)
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("offline migration is not supported by " _("offline migration is not supported by the source host"));
"the source host"));
goto error; goto error;
} }
@ -3832,8 +3829,7 @@ virDomainMigrate(virDomainPtr domain,
if (rc <= 0) { if (rc <= 0) {
if (rc == 0) if (rc == 0)
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("offline migration is not supported by " _("offline migration is not supported by the destination host"));
"the destination host"));
goto error; goto error;
} }
} }
@ -4021,8 +4017,7 @@ virDomainMigrate2(virDomainPtr domain,
if (rc <= 0) { if (rc <= 0) {
if (rc == 0) if (rc == 0)
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("offline migration is not supported by " _("offline migration is not supported by the source host"));
"the source host"));
goto error; goto error;
} }
rc = VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, rc = VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn,
@ -4030,8 +4025,7 @@ virDomainMigrate2(virDomainPtr domain,
if (rc <= 0) { if (rc <= 0) {
if (rc == 0) if (rc == 0)
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("offline migration is not supported by " _("offline migration is not supported by the destination host"));
"the destination host"));
goto error; goto error;
} }
} }
@ -4233,14 +4227,12 @@ virDomainMigrate3(virDomainPtr domain,
if (flags & VIR_MIGRATE_PEER2PEER) { if (flags & VIR_MIGRATE_PEER2PEER) {
virReportInvalidArg(flags, "%s", virReportInvalidArg(flags, "%s",
_("use virDomainMigrateToURI3 for peer-to-peer " _("use virDomainMigrateToURI3 for peer-to-peer migration"));
"migration"));
goto error; goto error;
} }
if (flags & VIR_MIGRATE_TUNNELLED) { if (flags & VIR_MIGRATE_TUNNELLED) {
virReportInvalidArg(flags, "%s", virReportInvalidArg(flags, "%s",
_("cannot perform tunnelled migration " _("cannot perform tunnelled migration without using peer2peer flag"));
"without using peer2peer flag"));
goto error; goto error;
} }
@ -4250,8 +4242,7 @@ virDomainMigrate3(virDomainPtr domain,
if (rc <= 0) { if (rc <= 0) {
if (rc == 0) if (rc == 0)
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("offline migration is not supported by " _("offline migration is not supported by the source host"));
"the source host"));
goto error; goto error;
} }
@ -4260,8 +4251,7 @@ virDomainMigrate3(virDomainPtr domain,
if (rc <= 0) { if (rc <= 0) {
if (rc == 0) if (rc == 0)
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("offline migration is not supported by " _("offline migration is not supported by the destination host"));
"the destination host"));
goto error; goto error;
} }
} }
@ -4303,8 +4293,7 @@ virDomainMigrate3(virDomainPtr domain,
if (!virTypedParamsCheck(params, nparams, compatParams, if (!virTypedParamsCheck(params, nparams, compatParams,
G_N_ELEMENTS(compatParams))) { G_N_ELEMENTS(compatParams))) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("Migration APIs with extensible parameters are not " _("Migration APIs with extensible parameters are not supported but extended parameters were passed"));
"supported but extended parameters were passed"));
goto error; goto error;
} }
@ -4346,8 +4335,7 @@ virDomainMigrate3(virDomainPtr domain,
VIR_DEBUG("Using migration protocol 2"); VIR_DEBUG("Using migration protocol 2");
if (dxml) { if (dxml) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("Unable to change target guest XML during " _("Unable to change target guest XML during migration"));
"migration"));
goto error; goto error;
} }
ddomain = virDomainMigrateVersion2(domain, dconn, flags, ddomain = virDomainMigrateVersion2(domain, dconn, flags,
@ -4367,8 +4355,7 @@ virDomainMigrate3(virDomainPtr domain,
VIR_DEBUG("Using migration protocol 1"); VIR_DEBUG("Using migration protocol 1");
if (dxml) { if (dxml) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("Unable to change target guest XML during " _("Unable to change target guest XML during migration"));
"migration"));
goto error; goto error;
} }
ddomain = virDomainMigrateVersion1(domain, dconn, flags, ddomain = virDomainMigrateVersion1(domain, dconn, flags,
@ -4413,8 +4400,7 @@ int virDomainMigrateUnmanagedCheckCompat(virDomainPtr domain,
if (rc <= 0) { if (rc <= 0) {
if (rc == 0) if (rc == 0)
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("offline migration is not supported by " _("offline migration is not supported by the source host"));
"the source host"));
return -1; return -1;
} }
} }
@ -4426,8 +4412,7 @@ int virDomainMigrateUnmanagedCheckCompat(virDomainPtr domain,
if (rc <= 0) { if (rc <= 0) {
if (rc == 0) if (rc == 0)
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("p2p migration is not supported by " _("p2p migration is not supported by the source host"));
"the source host"));
return -1; return -1;
} }
} else { } else {
@ -4436,8 +4421,7 @@ int virDomainMigrateUnmanagedCheckCompat(virDomainPtr domain,
if (rc <= 0) { if (rc <= 0) {
if (rc == 0) if (rc == 0)
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("direct migration is not supported by " _("direct migration is not supported by the source host"));
"the source host"));
return -1; return -1;
} }
} }
@ -8585,8 +8569,7 @@ virDomainSetMetadata(virDomainPtr domain,
case VIR_DOMAIN_METADATA_TITLE: case VIR_DOMAIN_METADATA_TITLE:
if (metadata && strchr(metadata, '\n')) { if (metadata && strchr(metadata, '\n')) {
virReportInvalidArg(metadata, "%s", virReportInvalidArg(metadata, "%s",
_("metadata title can't contain " _("metadata title can't contain newlines"));
"newlines"));
goto error; goto error;
} }
G_GNUC_FALLTHROUGH; G_GNUC_FALLTHROUGH;
@ -12697,8 +12680,7 @@ virDomainListGetStats(virDomainPtr *doms,
if (dom->conn != conn) { if (dom->conn != conn) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("domains in 'doms' array must belong to a " _("domains in 'doms' array must belong to a single connection"));
"single connection"));
goto cleanup; goto cleanup;
} }

3
src/libvirt-network.c
View File

@ -1974,8 +1974,7 @@ virNetworkSetMetadata(virNetworkPtr network,
case VIR_NETWORK_METADATA_TITLE: case VIR_NETWORK_METADATA_TITLE:
if (metadata && strchr(metadata, '\n')) { if (metadata && strchr(metadata, '\n')) {
virReportInvalidArg(metadata, "%s", virReportInvalidArg(metadata, "%s",
_("metadata title can't contain " _("metadata title can't contain newlines"));
"newlines"));
goto error; goto error;
} }
G_GNUC_FALLTHROUGH; G_GNUC_FALLTHROUGH;