On Tue, May 2, 2017 at 4:30 PM, Russell Bryant <russ...@ovn.org> wrote:
> On Sun, Apr 30, 2017 at 7:22 PM, Ben Pfaff <b...@ovn.org> wrote:
>> These only did anything if both the first two members of the struct were
>> nonnull, as you can see from the first test in get_row_by_id() in
>> lib/db-ctl-base.c, so these never did anything useful and I can't figure
>> out why they're there.
>>
>> Signed-off-by: Ben Pfaff <b...@ovn.org>
>> ---
>> ovn/utilities/ovn-nbctl.c | 3 ---
>> ovn/utilities/ovn-sbctl.c | 7 -------
>> utilities/ovs-vsctl.c | 16 +++++-----------
>> 3 files changed, 5 insertions(+), 21 deletions(-)
>
> This doesn't compile for me.
though I see now that the next patch fixes it, so either fix the build
here or wait for the ack on the next one before applying.
>
>> diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c
>> index 84176dea99d3..ed2145538e6f 100644
>> --- a/utilities/ovs-vsctl.c
>> +++ b/utilities/ovs-vsctl.c
>> @@ -2291,10 +2291,8 @@ cmd_get_aa_mapping(struct ctl_context *ctx)
>>
>>
>> static const struct ctl_table_class tables[OVSREC_N_TABLES] = {
>> - [OVSREC_TABLE_BRIDGE].row_ids = {
>> - {&ovsrec_table_bridge, &ovsrec_bridge_col_name, NULL},
>> - {&ovsrec_table_flow_sample_collector_set, NULL,
>> - &ovsrec_flow_sample_collector_set_col_bridge}},
>> + [OVSREC_TABLE_BRIDGE].row_ids[0] = {
>> + {&ovsrec_table_bridge, &ovsrec_bridge_col_name, NULL}},
>>
>> [OVSREC_TABLE_CONTROLLER].row_ids[0]
>> = {&ovsrec_table_bridge, &ovsrec_bridge_col_name,
>> @@ -2319,9 +2317,6 @@ static const struct ctl_table_class
>> tables[OVSREC_N_TABLES] = {
>> [OVSREC_TABLE_QOS].row_ids[0]
>> = {&ovsrec_table_port, &ovsrec_port_col_name, &ovsrec_port_col_qos},
>>
>> - [OVSREC_TABLE_SSL].row_ids[0]
>> - = {&ovsrec_table_open_vswitch, NULL, &ovsrec_open_vswitch_col_ssl},
>> -
>> [OVSREC_TABLE_SFLOW].row_ids[0]
>> = {&ovsrec_table_bridge, &ovsrec_bridge_col_name,
>> &ovsrec_bridge_col_sflow},
>> @@ -2329,10 +2324,9 @@ static const struct ctl_table_class
>> tables[OVSREC_N_TABLES] = {
>> [OVSREC_TABLE_FLOW_TABLE].row_ids[0]
>> = {&ovsrec_table_flow_table, &ovsrec_flow_table_col_name, NULL},
>>
>> - [OVSREC_TABLE_IPFIX].row_ids = {
>> - {&ovsrec_table_bridge, &ovsrec_bridge_col_name,
>> &ovsrec_bridge_col_ipfix},
>> - {&ovsrec_table_flow_sample_collector_set, NULL,
>> - &ovsrec_flow_sample_collector_set_col_ipfix}},
>> + [OVSREC_TABLE_IPFIX].row_ids[0] = {
>> + {&ovsrec_table_bridge, &ovsrec_bridge_col_name,
>> + &ovsrec_bridge_col_ipfix}},
>>
>> [OVSREC_TABLE_AUTOATTACH].row_ids[0]
>> = {&ovsrec_table_bridge, &ovsrec_bridge_col_name,
>
> Acked-by: Russell Bryant <russ...@ovn.org>
>
> with the build fix:
>
> diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c
> index ed21455..e6bb43f 100644
> --- a/utilities/ovs-vsctl.c
> +++ b/utilities/ovs-vsctl.c
> @@ -2291,8 +2291,8 @@ cmd_get_aa_mapping(struct ctl_context *ctx)
>
> ^L
> static const struct ctl_table_class tables[OVSREC_N_TABLES] = {
> - [OVSREC_TABLE_BRIDGE].row_ids[0] = {
> - {&ovsrec_table_bridge, &ovsrec_bridge_col_name, NULL}},
> + [OVSREC_TABLE_BRIDGE].row_ids[0]
> + = {&ovsrec_table_bridge, &ovsrec_bridge_col_name, NULL},
>
> [OVSREC_TABLE_CONTROLLER].row_ids[0]
> = {&ovsrec_table_bridge, &ovsrec_bridge_col_name,
> @@ -2324,9 +2324,9 @@ static const struct ctl_table_class
> tables[OVSREC_N_TABLES] = {
> [OVSREC_TABLE_FLOW_TABLE].row_ids[0]
> = {&ovsrec_table_flow_table, &ovsrec_flow_table_col_name, NULL},
>
> - [OVSREC_TABLE_IPFIX].row_ids[0] = {
> - {&ovsrec_table_bridge, &ovsrec_bridge_col_name,
> - &ovsrec_bridge_col_ipfix}},
> + [OVSREC_TABLE_IPFIX].row_ids[0]
> + = {&ovsrec_table_bridge, &ovsrec_bridge_col_name,
> + &ovsrec_bridge_col_ipfix},
>
> [OVSREC_TABLE_AUTOATTACH].row_ids[0]
> = {&ovsrec_table_bridge, &ovsrec_bridge_col_name,
--
Russell Bryant
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
