vqsim: Make vqsim compile

Also add vqsim binary to .gitignore.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>

vqsim/.gitignore

@@ -0,0 +1 @@
+vqsim

vqsim/Makefile.am

@@ -39,6 +39,7 @@ noinst_PROGRAMS		= vqsim
 vqsim_LDADD		= $(top_builddir)/common_lib/libcorosync_common.la \
 			  ../exec/corosync-votequorum.o ../exec/corosync-icmap.o ../exec/corosync-logsys.o \
 			  ../exec/corosync-coroparse.o ../exec/corosync-logconfig.o \
+			  ../exec/corosync-util.o \
 			  $(LIBQB_LIBS)
 if VQSIM_READLINE
 vqsim_LDADD		+= -lreadline

vqsim/vqmain.c

@@ -26,6 +26,9 @@
 extern int coroparse_configparse (icmap_map_t config_map, const char **error_string);
 extern int corosync_log_config_read (const char **error_string);
 
+/* 'Keep the compiler happy' time */
+const char *corosync_get_config_file(void);
+
 /* One of these per partition */
 struct vq_partition {
 	TAILQ_HEAD(, vq_node) nodelist;
@@ -70,6 +73,15 @@ static size_t input_buf_term = 0;
 static int is_tty;
 #endif
 
+/* 'Keep the compiler happy' time */
+static char corosync_config_file[PATH_MAX + 1] = COROSYSCONFDIR "/corosync.conf";
+
+const char *corosync_get_config_file(void)
+{
+
+	return (corosync_config_file);
+}
+
 /* Tell all non-quorate nodes to quit */
 static void force_fence(void)
 {
@@ -110,7 +122,7 @@ static void print_quorum_state(struct vq_node *node)
 	}
 
 	fprintf(output_file, "%d:%02d: q=%d ring=[%d/%lld] ", node->partition->num, node->nodeid, node->last_quorate,
-		node->last_ring_id.rep.nodeid, node->last_ring_id.seq);
+		node->last_ring_id.nodeid, node->last_ring_id.seq);
 	fprintf(output_file, "nodes=[");
 	for (i = 0; i < node->last_view_list_entries; i++) {
 		if (i) {
@@ -209,6 +221,7 @@ static int read_corosync_conf(void)
 	        log_printf (LOGSYS_LEVEL_ERROR, "Can't initialize log thread");
 		return -1;
 	}
+
 	return 0;
 }
 
@@ -287,7 +300,7 @@ static void send_partition_to_nodes(struct vq_partition *partition, int newring)
 	TAILQ_FOREACH(vqn, &partition->nodelist, entries) {
 		nodelist[nodes++] = vqn->nodeid;
 		if (first) {
-			partition->ring_id.rep.nodeid = vqn->nodeid;
+			partition->ring_id.nodeid = vqn->nodeid;
 			first = 0;
 		}
 	}
@@ -303,7 +316,7 @@ static void init_partitions(void)
 
 	for (i=0; i<MAX_PARTITIONS; i++) {
 		TAILQ_INIT(&partitions[i].nodelist);
-		partitions[i].ring_id.rep.nodeid = 1000+i;
+		partitions[i].ring_id.nodeid = 1000+i;
 		partitions[i].ring_id.seq = 0;
 		partitions[i].num = i;
 	}

vqsim/vqsim_vq_engine.c

@@ -44,6 +44,7 @@ static unsigned int qdevice_timeout = VOTEQUORUM_QDEVICE_DEFAULT_TIMEOUT;
 
 /* 'Keep the compiler happy' time */
 char *get_run_dir(void);
+
 int api_timer_add_duration (
         unsigned long long nanosec_duration,
         void *data,
@@ -262,7 +263,7 @@ static int poll_qdevice(int onoff)
 	int res;
 
 	pollmsg.cast_vote = onoff;
-	pollmsg.ring_id.nodeid = current_ring_id.rep.nodeid;
+	pollmsg.ring_id.nodeid = current_ring_id.nodeid;
 	pollmsg.ring_id.seq = current_ring_id.seq;
 	strcpy(pollmsg.name, QDEVICE_NAME);
 
@@ -374,7 +375,7 @@ static void initial_sync(int nodeid)
 	unsigned int member_list[1] = {nodeid};
 	struct memb_ring_id ring_id;
 
-	ring_id.rep.nodeid = our_nodeid;
+	ring_id.nodeid = our_nodeid;
 	ring_id.seq = 1;
 
 	/* cluster with just us in it */