[PATCH 2/5] network: belatedly update an error message

Laine Stump posted 5 patches 1 year, 5 months ago
[PATCH 2/5] network: belatedly update an error message
Posted by Laine Stump 1 year, 5 months ago
The 'open' forward type probably hadn't yet been added when this
message was written.

Signed-off-by: Laine Stump <laine@redhat.com>
---
 src/conf/network_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 3383906c58..5fadaf35e9 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -1851,7 +1851,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt,
     case VIR_NETWORK_FORWARD_BRIDGE:
         if (def->delay || stp || def->bridgeZone) {
             virReportError(VIR_ERR_XML_ERROR,
-                           _("bridge delay/stp/zone options only allowed in route, nat, and isolated mode, not in %1$s (network '%2$s')"),
+                           _("bridge delay/stp/zone options only allowed in open, route, nat, and isolated mode, not in %1$s (network '%2$s')"),
                            virNetworkForwardTypeToString(def->forward.type),
                            def->name);
             return NULL;
-- 
2.46.0
Re: [PATCH 2/5] network: belatedly update an error message
Posted by Martin Kletzander 1 year, 4 months ago
On Thu, Sep 05, 2024 at 01:07:56PM -0400, Laine Stump wrote:
>The 'open' forward type probably hadn't yet been added when this
>message was written.
>
>Signed-off-by: Laine Stump <laine@redhat.com>

Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

>---
> src/conf/network_conf.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
>index 3383906c58..5fadaf35e9 100644
>--- a/src/conf/network_conf.c
>+++ b/src/conf/network_conf.c
>@@ -1851,7 +1851,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt,
>     case VIR_NETWORK_FORWARD_BRIDGE:
>         if (def->delay || stp || def->bridgeZone) {
>             virReportError(VIR_ERR_XML_ERROR,
>-                           _("bridge delay/stp/zone options only allowed in route, nat, and isolated mode, not in %1$s (network '%2$s')"),
>+                           _("bridge delay/stp/zone options only allowed in open, route, nat, and isolated mode, not in %1$s (network '%2$s')"),
>                            virNetworkForwardTypeToString(def->forward.type),
>                            def->name);
>             return NULL;
>-- 
>2.46.0
>