Using designated initializers

Author: AlexAltea

core/hax.c

@@ -41,16 +41,16 @@
 
 /* deal with module parameter */
 struct config_t config = {
-    0, /* memory_pass_through */
-    0, /* disable_ept */
-    1, /* ept_small_pages */
-    1, /* disable_vpid */
-    1, /* disable_unrestricted_guest */
-    1, /* no_cpuid_pass_through */
-    0, /* cpuid_pass_through */
-    0, /* cpuid_no_mwait */
-    0
-}; /* no_msr_pass_through */
+    .memory_pass_through         = 0,
+    .disable_ept                 = 0,
+    .ept_small_pages             = 1,
+    .disable_vpid                = 1,
+    .disable_unrestricted_guest  = 1,
+    .no_cpuid_pass_through       = 1,
+    .cpuid_pass_through          = 0,
+    .cpuid_no_mwait              = 0,
+    .no_msr_pass_through         = 0
+};
 
 struct hax_page *io_bitmap_page_a;
 struct hax_page *io_bitmap_page_b;
@@ -147,7 +147,7 @@ int hax_em64t_enabled(void)
  */
 static int hax_vmx_enable_check(void)
 {
-    int vts = 0, nxs =0, vte = 0, nxe = 0, em64s = 0, em64e = 0, finished = 0;
+    int vts = 0, nxs = 0, vte = 0, nxe = 0, em64s = 0, em64e = 0, finished = 0;
     int cpu, tnum = 0, error = 0;
 
     for (cpu = 0; cpu < max_cpus; cpu++) {

core/vcpu.c

@@ -367,31 +367,23 @@ static int vcpu_vpid_free(struct vcpu_t *vcpu)
 }
 
 static int (*handler_funcs[])(struct vcpu_t *vcpu, struct hax_tunnel *htun) = {
-    exit_exc_nmi,
-    exit_interrupt,
-    exit_triple_fault,
-    0, 0, 0, 0,
-    exit_interrupt_window,                      // Interrupt window
-    exit_interrupt_window,                      // NMI window
-    0,
-    exit_cpuid,
-    0,
-    exit_hlt,
-    0,
-    exit_invlpg,
-    0,
-    exit_rdtsc,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,            // 17 ... 27
-    exit_cr_access,
-    exit_dr_access,
-    exit_io_access,
-    exit_msr_read,
-    exit_msr_write,
-    exit_invalid_guest_state,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 34 ... 47
-    exit_ept_violation,
-    exit_ept_misconfiguration,
-    0, 0, 0, 0, 0, 0                            // 50 ... 55
+    [VMX_EXIT_INT_EXCEPTION_NMI]  = exit_exc_nmi,
+    [VMX_EXIT_EXT_INTERRUPT]      = exit_interrupt,
+    [VMX_EXIT_TRIPLE_FAULT]       = exit_triple_fault,
+    [VMX_EXIT_PENDING_INTERRUPT]  = exit_interrupt_window,
+    [VMX_EXIT_PENDING_NMI]        = exit_interrupt_window,
+    [VMX_EXIT_CPUID]              = exit_cpuid,
+    [VMX_EXIT_HLT]                = exit_hlt,
+    [VMX_EXIT_INVLPG]             = exit_invlpg,
+    [VMX_EXIT_RDTSC]              = exit_rdtsc,
+    [VMX_EXIT_CR_ACCESS]          = exit_cr_access,
+    [VMX_EXIT_DR_ACCESS]          = exit_dr_access,
+    [VMX_EXIT_IO]                 = exit_io_access,
+    [VMX_EXIT_MSR_READ]           = exit_msr_read,
+    [VMX_EXIT_MSR_WRITE]          = exit_msr_write,
+    [VMX_EXIT_FAILED_VMENTER_GS]  = exit_invalid_guest_state,
+    [VMX_EXIT_EPT_VIOLATION]      = exit_ept_violation,
+    [VMX_EXIT_EPT_MISCONFIG]      = exit_ept_misconfiguration,
 };
 
 static int nr_handlers = ARRAY_ELEMENTS(handler_funcs);

windows/hax_entry.c

@@ -60,7 +60,7 @@ static int hax_host_init(void)
     /* we get the max_cpus from real_cpus in darwin, so add 1 here */
     max_cpus++;
 
-    ret =smpc_dpc_init();
+    ret = smpc_dpc_init();
     if (ret < 0) {
         return ret;
     }

windows/hax_mm.c

@@ -195,7 +195,7 @@ uint64_t get_hpfn_from_pmem(struct hax_vcpu_mem *pmem, uint64_t va)
             else
                 return kphys.QuadPart >> page_shift;
         } else {
-            unsigned long long index =0;
+            unsigned long long index = 0;
             PMDL pmdl = NULL;
             PPFN_NUMBER ppfnnum;