[ovs-dev] [PATCH v3 04/10] ovn: Drop unnecessary br_int local variable.

Russell Bryant rbryant at redhat.com
Tue Jul 21 16:59:14 UTC 2015


When getting the initial configuration, go ahead and store br_int in
the controller context.  This is already done in the main loop, but a
future patch wants to use br_int from the controller context sooner in
the code.

Signed-off-by: Russell Bryant <rbryant at redhat.com>
---
 ovn/controller/ovn-controller.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c
index fda1534..bb9c7a3 100644
--- a/ovn/controller/ovn-controller.c
+++ b/ovn/controller/ovn-controller.c
@@ -105,7 +105,6 @@ get_core_config(struct controller_ctx *ctx)
     }
 
     while (1) {
-        const struct ovsrec_bridge *br_int;
         const char *remote, *system_id, *br_int_name;
 
         ovsdb_idl_run(ctx->ovs_idl);
@@ -116,8 +115,8 @@ get_core_config(struct controller_ctx *ctx)
         }
         ctx->br_int_name = xstrdup(br_int_name);
 
-        br_int = get_bridge(ctx, ctx->br_int_name);
-        if (!br_int) {
+        ctx->br_int = get_bridge(ctx, ctx->br_int_name);
+        if (!ctx->br_int) {
             VLOG_INFO("Integration bridge '%s' does not exist.  Waiting...",
                       ctx->br_int_name);
             goto try_again;
-- 
2.4.3




More information about the dev mailing list