Imlpement plugin setup, vcpu init and locks for insn logging.

Author: Rot127

contrib/plugins/bap-tracing/tracing.c

@@ -7,30 +7,26 @@
 
 static TraceState state;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
-static VCPU *get_vcpu(TraceState *state, int vcpu_index) {
-  VCPU *c;
-  g_rw_lock_reader_lock(&state->vcpus_array_lock);
-  c = &g_array_index(state->vcpus, VCPU, vcpu_index);
-  g_rw_lock_reader_unlock(&state->vcpus_array_lock);
-
-  return c;
-}
-#pragma GCC diagnostic pop
-
-static void log_insn_frame(unsigned int cpu_index, void *udata) {
-  // VCPU *vcpu = get_vcpu(state, cpu_index);
+static void log_insn_exec(unsigned int vcpu_index, void *udata) {
+  g_rw_lock_reader_lock(&state.vcpus_array_lock);
+  // VCPU *c = &g_array_index(state.vcpus, VCPU, vcpu_index);
 
+  g_rw_lock_writer_lock(&state.frame_buffer_lock);
   // Add change to previous frame
   // Finish previous frame
   // Check if buffer should be dumped to file.
   // Open new one.
+  g_rw_lock_writer_unlock(&state.frame_buffer_lock);
+  g_rw_lock_reader_unlock(&state.vcpus_array_lock);
+
   return;
 }
 
 static void vcpu_init(qemu_plugin_id_t id, unsigned int vcpu_index) {
-  // Add new vcpu
+  g_rw_lock_writer_lock(&state.vcpus_array_lock);
+  VCPU *vcpu = calloc(sizeof(VCPU), 1);
+  g_array_insert_vals(state.vcpus, vcpu_index, &vcpu, 1);
+  g_rw_lock_writer_unlock(&state.vcpus_array_lock);
 }
 
 static void plugin_exit(qemu_plugin_id_t id, void *udata) {
@@ -43,23 +39,25 @@ static void cb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) {
   size_t n_insns = qemu_plugin_tb_n_insns(tb);
   for (size_t i = 0; i < n_insns; i++) {
     insn = qemu_plugin_tb_get_insn(tb, i);
-    qemu_plugin_register_vcpu_insn_exec_cb(insn, log_insn_frame,
-                                           QEMU_PLUGIN_CB_R_REGS, &state);
+    qemu_plugin_register_vcpu_insn_exec_cb(insn, log_insn_exec,
+                                           QEMU_PLUGIN_CB_R_REGS, NULL);
   }
 }
 
 QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
                                            const qemu_info_t *info, int argc,
                                            char **argv) {
+  const char *target_path = "/tmp/test.trace";
+  state.frame_buffer = frame_buffer_init(FRAME_BUFFER_SIZE);
+  state.vcpus = g_array_new(false, true, sizeof(VCPU));
+  state.file = fopen(target_path, "r");
+  if (!(state.frame_buffer || state.vcpus || state.file)) {
+    return 1;
+  }
+
   qemu_plugin_register_vcpu_init_cb(id, vcpu_init);
   qemu_plugin_register_vcpu_tb_trans_cb(id, cb_trans);
   qemu_plugin_register_atexit_cb(id, plugin_exit, NULL);
 
-  // Get reg names
-  // qemu_plugin_get_registers
-  //
-  // Logging
-  // qemu_plugin_outs
-
   return 0;
 }