[ovs-dev] [PATCH] ofctrl: Placate GCC.
Ben Pfaff
blp at ovn.org
Tue Jul 31 16:57:58 UTC 2018
Some GCC versions don't like ".x.y =", complaining about an uninitialized
field.
Without this patch we get travis failures, e.g.
https://travis-ci.org/openvswitch/ovs/jobs/410404752:
ovn/controller/ofctrl.c: In function ‘ofctrl_put’:
ovn/controller/ofctrl.c:1086:9: error: missing initializer for field ‘flags’ of ‘struct ofputil_meter_config’ [-Werror=missing-field-initializers]
};
^
In file included from ovn/controller/ofctrl.c:35:0:
./include/openvswitch/ofp-meter.h:53:14: note: ‘flags’ declared here
uint16_t flags;
^
With it, it passes.
Signed-off-by: Ben Pfaff <blp at ovn.org>
---
ovn/controller/ofctrl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c
index d2afd08129a2..96c57f143843 100644
--- a/ovn/controller/ofctrl.c
+++ b/ovn/controller/ofctrl.c
@@ -1082,7 +1082,7 @@ ofctrl_put(struct hmap *flow_table, struct shash *pending_ct_zones,
/* Delete the meter. */
struct ofputil_meter_mod mm = {
.command = OFPMC13_DELETE,
- .meter.meter_id = m_installed->table_id,
+ .meter = { .meter_id = m_installed->table_id },
};
add_meter_mod(&mm, &msgs);
--
2.16.1
More information about the dev
mailing list