From 75ad7c814916f116d183fe51b67908a3569fa014 Mon Sep 17 00:00:00 2001
From: Petr Benes <w.benny@outlook.com>
Date: Fri, 1 Mar 2019 13:16:10 +0100
Subject: [PATCH] cosmetic changes

---
 src/hvpp/hvpp/ia32/arch/segment.h         | 3 ++-
 src/hvpp/hvpp/ia32/exception.h            | 1 +
 src/hvpp/hvpp/ia32/msr/vmx.h              | 2 +-
 src/hvpp/hvpp/vmexit/vmexit_c_wrapper.cpp | 2 +-
 src/hvpp/hvpp/vmexit/vmexit_passthrough.h | 3 +++
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/hvpp/hvpp/ia32/arch/segment.h b/src/hvpp/hvpp/ia32/arch/segment.h
index 764f277..8b33f64 100644
--- a/src/hvpp/hvpp/ia32/arch/segment.h
+++ b/src/hvpp/hvpp/ia32/arch/segment.h
@@ -180,7 +180,8 @@ struct idt_access_t
 
 static_assert(sizeof(segment_access_t)     == 2);
 static_assert(sizeof(segment_access_vmx_t) == 4);
-static_assert(sizeof(idt_access_t)     == 2);
+
+static_assert(sizeof(idt_access_t)         == 2);
 
 //
 // Descriptors
diff --git a/src/hvpp/hvpp/ia32/exception.h b/src/hvpp/hvpp/ia32/exception.h
index 1c1b21d..a3422de 100644
--- a/src/hvpp/hvpp/ia32/exception.h
+++ b/src/hvpp/hvpp/ia32/exception.h
@@ -30,6 +30,7 @@ enum class exception_vector : uint32_t
   // Windows specific.
   //
 
+  apc_interrupt               = 31,
   dpc_interrupt               = 47,
   clock_interrupt             = 209,
   pmi_interrupt               = 254,
diff --git a/src/hvpp/hvpp/ia32/msr/vmx.h b/src/hvpp/hvpp/ia32/msr/vmx.h
index eb4183c..7c3c813 100644
--- a/src/hvpp/hvpp/ia32/msr/vmx.h
+++ b/src/hvpp/hvpp/ia32/msr/vmx.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "ia32/arch.h" // cr0_t, cr4_t
+#include "../ia32/arch.h" // cr0_t, cr4_t
 
 #include <cstdint>
 
diff --git a/src/hvpp/hvpp/vmexit/vmexit_c_wrapper.cpp b/src/hvpp/hvpp/vmexit/vmexit_c_wrapper.cpp
index a62dd3f..f92ed5a 100644
--- a/src/hvpp/hvpp/vmexit/vmexit_c_wrapper.cpp
+++ b/src/hvpp/hvpp/vmexit/vmexit_c_wrapper.cpp
@@ -49,7 +49,7 @@ void vmexit_c_wrapper_handler::handle(vcpu_t& vp) noexcept
     //
 
     passthrough_context context;
-    context.passthrough_routine = (passthrough_fn_t)&vmexit_c_wrapper_handler::handle_passthrough;
+    context.passthrough_routine = passthrough_fn_t(&vmexit_c_wrapper_handler::handle_passthrough);
     context.context             = context_;
     context.handler_instance    = this;
     context.handler_method      = cpp_handler;
diff --git a/src/hvpp/hvpp/vmexit/vmexit_passthrough.h b/src/hvpp/hvpp/vmexit/vmexit_passthrough.h
index 94cd669..6d1427e 100644
--- a/src/hvpp/hvpp/vmexit/vmexit_passthrough.h
+++ b/src/hvpp/hvpp/vmexit/vmexit_passthrough.h
@@ -58,6 +58,9 @@ class vmexit_passthrough_handler
 
     void handle_vm_fallback(vcpu_t& vp) noexcept override;
 
+    //
+    //
+    //
     virtual void handle_interrupt(vcpu_t& vp) noexcept;
 
     virtual void handle_emulate_syscall(vcpu_t& vp) noexcept;