External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 15:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

virDomainControllerDefValidate: Un-break lines in error messages

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-08-26 10:39:12 +02:00
parent 45e5648350
commit b7efd99173
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/conf/domain_validate.c
View File

@ -1129,8 +1129,7 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller)
controller->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) { controller->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) {
if (controller->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { if (controller->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("pci-root and pcie-root controllers " _("pci-root and pcie-root controllers should not have an address"));
"should not have an address"));
return -1; return -1;
} }
} }
@ -1147,8 +1146,7 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller)
if (opts->targetIndex < 0 || opts->targetIndex > 30) { if (opts->targetIndex < 0 || opts->targetIndex > 30) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("PCI controller target index '%d' out of " _("PCI controller target index '%d' out of range - must be 0-30"),
"range - must be 0-30"),
opts->targetIndex); opts->targetIndex);
return -1; return -1;
} }
@ -1156,8 +1154,7 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller)
if ((controller->idx == 0 && opts->targetIndex != 0) || if ((controller->idx == 0 && opts->targetIndex != 0) ||
(controller->idx != 0 && opts->targetIndex == 0)) { (controller->idx != 0 && opts->targetIndex == 0)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Only the PCI controller with index 0 can " _("Only the PCI controller with index 0 can have target index 0, and vice versa"));
"have target index 0, and vice versa"));
return -1; return -1;
} }
} }
@ -1165,8 +1162,7 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller)
if (opts->chassisNr != -1) { if (opts->chassisNr != -1) {
if (opts->chassisNr < 1 || opts->chassisNr > 255) { if (opts->chassisNr < 1 || opts->chassisNr > 255) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("PCI controller chassisNr '%d' out of range " _("PCI controller chassisNr '%d' out of range - must be 1-255"),
"- must be 1-255"),
opts->chassisNr); opts->chassisNr);
return -1; return -1;
} }
@ -1175,8 +1171,7 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller)
if (opts->chassis != -1) { if (opts->chassis != -1) {
if (opts->chassis < 0 || opts->chassis > 255) { if (opts->chassis < 0 || opts->chassis > 255) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("PCI controller chassis '%d' out of range " _("PCI controller chassis '%d' out of range - must be 0-255"),
"- must be 0-255"),
opts->chassis); opts->chassis);
return -1; return -1;
} }
@ -1185,8 +1180,7 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller)
if (opts->port != -1) { if (opts->port != -1) {
if (opts->port < 0 || opts->port > 255) { if (opts->port < 0 || opts->port > 255) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("PCI controller port '%d' out of range " _("PCI controller port '%d' out of range - must be 0-255"),
"- must be 0-255"),
opts->port); opts->port);
return -1; return -1;
} }
@ -1195,8 +1189,7 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller)
if (opts->busNr != -1) { if (opts->busNr != -1) {
if (opts->busNr < 1 || opts->busNr > 254) { if (opts->busNr < 1 || opts->busNr > 254) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("PCI controller busNr '%d' out of range " _("PCI controller busNr '%d' out of range - must be 1-254"),
"- must be 1-254"),
opts->busNr); opts->busNr);
return -1; return -1;
} }
@ -1204,8 +1197,7 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller)
if (opts->numaNode >= 0 && controller->idx == 0) { if (opts->numaNode >= 0 && controller->idx == 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("The PCI controller with index=0 can't " _("The PCI controller with index=0 can't be associated with a NUMA node"));
"be associated with a NUMA node"));
return -1; return -1;
} }
} }