fix test

Author: nyuichi

CMakeLists.txt

@@ -8,4 +8,5 @@ include_directories(include)
 
 include(${CMAKE_SYSTEM_NAME}.cmake)
 
+enable_testing()
 add_subdirectory(test)

src/vmm_kvm.c

@@ -11,19 +11,19 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-int kvm, vmfd;
-struct kvm_run *run;
-struct kvm_regs regs;
-struct kvm_sregs sregs;
-int vcpufd;
+static int kvm, vmfd;
+static struct kvm_run *run;
+static struct kvm_regs regs;
+static struct kvm_sregs sregs;
+static int vcpufd;
 
 int
 vmm_create(void)
 {
   int ret;
 
   if ((kvm = open("/dev/kvm", O_RDWR | O_CLOEXEC)) < 0)
-    return VMM_ERROR;
+    return VMM_ENOTSUP;
 
   /* check API version */
   if ((ret = ioctl(kvm, KVM_GET_API_VERSION, NULL)) < 0)
@@ -65,7 +65,6 @@ vmm_cpu_create()
   /* Map the shared kvm_run structure and following data. */
   if ((mmap_size = ioctl(kvm, KVM_GET_VCPU_MMAP_SIZE, NULL)) < 0)
     return VMM_ERROR;
-  assert(mmap_size < sizeof(*run))
   if ((run = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_SHARED, vcpufd, 0)) == 0)
     return VMM_ERROR;
 
@@ -191,6 +190,72 @@ vmm_cpu_write_register(vmm_x64_reg_t reg, uint64_t value)
   return 0;
 }
 
+int
+vmm_cpu_read_register(vmm_x64_reg_t reg, uint64_t *value)
+{
+  if (ioctl(vcpufd, KVM_GET_REGS, &regs) < 0)
+    return VMM_ERROR;
+  if (ioctl(vcpufd, KVM_GET_SREGS, &sregs) < 0)
+    return VMM_ERROR;
+
+  switch (reg) {
+  case VMM_X64_RIP:      *value = regs.rip; break;
+  case VMM_X64_RFLAGS:   *value = regs.rflags; break;
+  case VMM_X64_RAX:      *value = regs.rax; break;
+  case VMM_X64_RBX:      *value = regs.rbx; break;
+  case VMM_X64_RCX:      *value = regs.rcx; break;
+  case VMM_X64_RDX:      *value = regs.rdx; break;
+  case VMM_X64_RSI:      *value = regs.rsi; break;
+  case VMM_X64_RDI:      *value = regs.rdi; break;
+  case VMM_X64_RSP:      *value = regs.rsp; break;
+  case VMM_X64_RBP:      *value = regs.rbp; break;
+  case VMM_X64_R8:
+  case VMM_X64_R9:
+  case VMM_X64_R10:
+  case VMM_X64_R11:
+  case VMM_X64_R12:
+  case VMM_X64_R13:
+  case VMM_X64_R14:
+  case VMM_X64_R15:
+  case VMM_X64_CS:
+  case VMM_X64_SS:
+  case VMM_X64_DS:
+  case VMM_X64_ES:
+  case VMM_X64_FS:
+  case VMM_X64_GS:
+  case VMM_X64_IDT_BASE:
+  case VMM_X64_IDT_LIMIT:
+  case VMM_X64_GDT_BASE:
+  case VMM_X64_GDT_LIMIT:
+  case VMM_X64_LDTR:
+  case VMM_X64_LDT_BASE:
+  case VMM_X64_LDT_LIMIT:
+  case VMM_X64_LDT_AR:
+  case VMM_X64_TR:
+  case VMM_X64_TSS_BASE:
+  case VMM_X64_TSS_LIMIT:
+  case VMM_X64_TSS_AR:
+  case VMM_X64_CR0:
+  case VMM_X64_CR1:
+  case VMM_X64_CR2:
+  case VMM_X64_CR3:
+  case VMM_X64_CR4:
+  case VMM_X64_DR0:
+  case VMM_X64_DR1:
+  case VMM_X64_DR2:
+  case VMM_X64_DR3:
+  case VMM_X64_DR4:
+  case VMM_X64_DR5:
+  case VMM_X64_DR6:
+  case VMM_X64_DR7:
+  case VMM_X64_TPR:
+  case VMM_X64_XCR0:
+  default:
+    assert(false);
+  }
+  return 0;
+}
+
 int
 vmm_get(int id, uint64_t *value)
 {

test/CMakeLists.txt

@@ -1,11 +1,4 @@
-cmake_minimum_required(VERSION 2.4)
-
-project(hv_test)
-
-set(CMAKE_C_FLAGS_RELEASE "-Wall -Wextra -O2")
-set(CMAKE_C_FLAGS_DEBUG "-Wall -Wextra -g -O0")
-
 add_executable(main main.c)
-target_link_libraries(main hv)
+target_link_libraries(main vmm)
 
-add_test(test_main COMMAND main)
+add_test(NAME test_main COMMAND $<TARGET_FILE:main>)

test/main.c

@@ -24,7 +24,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "hv.h"
+#include <vmm.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -73,25 +73,30 @@ int main(void)
   /* Repeatedly run code and handle VM exits. */
   while (1) {
     vmm_cpu_run();
-    uint64_t exit_reason;
+    uint64_t exit_reason, value;
     vmm_get(VMM_CTRL_EXIT_REASON, &exit_reason);
     switch (exit_reason) {
     case VMM_EXIT_HLT:
       puts("KVM_EXIT_HLT");
       return 0;
-    /* case KVM_EXIT_IO: */
-    /*   if (run->io.direction == KVM_EXIT_IO_OUT && run->io.size == 1 && run->io.port == 0x3f8 && run->io.count == 1) */
-    /*     putchar(*(((char *)run) + run->io.data_offset)); */
-    /*   else */
-    /*     errx(1, "unhandled KVM_EXIT_IO"); */
-    /*   break; */
+    case VMM_EXIT_IO:
+      //if (run->io.direction == KVM_EXIT_IO_OUT && run->io.size == 1 && run->io.port == 0x3f8 && run->io.count == 1)
+      //  putchar(*(((char *)run) + run->io.data_offset));
+      //else
+      //  errx(1, "unhandled KVM_EXIT_IO");
+      //break;
+      vmm_cpu_read_register(VMM_X64_RAX, &value);
+      putchar((char) value);
+      break;
     /* case KVM_EXIT_FAIL_ENTRY: */
     /*   errx(1, "KVM_EXIT_FAIL_ENTRY: hardware_entry_failure_reason = 0x%llx", */
     /*        (unsigned long long)run->fail_entry.hardware_entry_failure_reason); */
     /* case KVM_EXIT_INTERNAL_ERROR: */
     /*   errx(1, "KVM_EXIT_INTERNAL_ERROR: suberror = 0x%x", run->internal.suberror); */
     default:
-     fprintf(stderr, "exit_reason = 0x%llx", exit_reason);
+     vmm_cpu_read_register(VMM_X64_RIP, &value);
+     fprintf(stderr, "ip = 0x%lx\n", value);
+     fprintf(stderr, "exit_reason = 0x%lx", exit_reason);
      abort();
     }
   }