[ovs-dev] [PATCH 10/30] smap: New function smap_get_def().

Ryan Moats rmoats at us.ibm.com
Mon Aug 8 16:03:07 UTC 2016


"dev" <dev-bounces at openvswitch.org> wrote on 08/08/2016 02:44:49 AM:

> From: Ben Pfaff <blp at ovn.org>
> To: dev at openvswitch.org
> Cc: Ben Pfaff <blp at ovn.org>
> Date: 08/08/2016 02:47 AM
> Subject: [ovs-dev] [PATCH 10/30] smap: New function smap_get_def().
> Sent by: "dev" <dev-bounces at openvswitch.org>
>
> Signed-off-by: Ben Pfaff <blp at ovn.org>
> ---
>  lib/bfd.c                       | 60 ++++++++++++
> +----------------------------
>  lib/smap.c                      | 25 +++++++++--------
>  lib/smap.h                      |  4 ++-
>  ovn/controller/chassis.c        |  7 +++--
>  ovn/controller/encaps.c         |  5 ++--
>  ovn/controller/ovn-controller.c |  6 ++---
>  ovn/controller/patch.c          |  6 ++---
>  ovn/northd/ovn-northd.c         |  7 ++---
>  ovn/utilities/ovn-sbctl.c       |  4 +--
>  9 files changed, 49 insertions(+), 75 deletions(-)
>

[snip]

> diff --git a/ovn/controller/patch.c b/ovn/controller/patch.c
> index 012e6ba..f9efc4c 100644
> --- a/ovn/controller/patch.c
> +++ b/ovn/controller/patch.c
> @@ -150,10 +150,8 @@ add_bridge_mappings(struct controller_ctx *ctx,
>      const struct ovsrec_open_vswitch *cfg;
>      cfg = ovsrec_open_vswitch_first(ctx->ovs_idl);
>      if (cfg) {
> -        mappings_cfg = smap_get(&cfg->external_ids,
"ovn-bridge-mappings");
> -        if (!mappings_cfg) {
> -            mappings_cfg = "";
> -        }
> +        mappings_cfg = smap_get_def(&cfg->external_ids, "ovn-
> bridge-mappings",
> +                                    "");
>      }
>
>      /* Parse bridge mappings. */

The above piece of the patch set doesn't apply cleanly for me
and I'm missing parts 11-18 in my mailbox, so I'm going to stop
here ...

I'll pick up after parts 1-9 merge and this gets rebased...

Ryan



More information about the dev mailing list