From a426e7292fc6a8c9d37e60abd0ff58eac983b18e Mon Sep 17 00:00:00 2001 From: Numan Siddique Date: Thu, 11 Jun 2020 12:47:08 +0530 Subject: [PATCH 21/22] Fix compilation error when configured with --enable-sparse. The below error is seen. ../controller/ovn-controller.c:2305:70: error: Using plain integer as NULL pointer make[1]: *** [Makefile:2000: controller/ovn-controller.o] Error 1 make[1]: *** Waiting for unfinished jobs.... Fixes: 512b884dea3f("Add northd and ovn-controller cluster status reset commands.") CC: Mark Michelson Acked-by: Dumitru Ceara Signed-off-by: Numan Siddique (cherry-picked from upstream ovn master commit 10deb869fff9f0b6736523cf3bdf0d856035895b) Change-Id: Iaff476538e85a9d68a1269cd55963edb5275dbe3 --- controller/ovn-controller.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c index fe6048153..67b3cd989 100644 --- a/controller/ovn-controller.c +++ b/controller/ovn-controller.c @@ -476,7 +476,7 @@ update_sb_db(struct ovsdb_idl *ovs_idl, struct ovsdb_idl *ovnsb_idl, if (monitor_all_p) { *monitor_all_p = monitor_all; } - if (*reset_ovnsb_idl_min_index) { + if (reset_ovnsb_idl_min_index && *reset_ovnsb_idl_min_index) { VLOG_INFO("Resetting southbound database cluster state"); engine_set_force_recompute(true); ovsdb_idl_reset_min_index(ovnsb_idl); @@ -2571,7 +2571,7 @@ main(int argc, char *argv[]) if (!restart) { bool done = !ovsdb_idl_has_ever_connected(ovnsb_idl_loop.idl); while (!done) { - update_sb_db(ovs_idl_loop.idl, ovnsb_idl_loop.idl, NULL, false); + update_sb_db(ovs_idl_loop.idl, ovnsb_idl_loop.idl, NULL, NULL); update_ssl_config(ovsrec_ssl_table_get(ovs_idl_loop.idl)); struct ovsdb_idl_txn *ovs_idl_txn -- 2.26.2