KVM-VMI · adlazar · Oct 7, 2021 · Oct 8, 2021 · Oct 8, 2021 · Oct 11, 2021
diff --git a/.gitmodules b/.gitmodules
@@ -6,7 +6,7 @@
 	url = https://github.com/KVM-VMI/qemu
 [submodule "libvmi"]
 	path = libvmi
-	url = https://github.com/KVM-VMI/libvmi
+	url = https://github.com/adlazar/libvmi
 [submodule "libkvmi"]
 	path = libkvmi
-	url = https://github.com/bitdefender/libkvmi
+	url = https://github.com/adlazar/libkvmi
diff --git a/kvm b/kvm
diff --git a/libkvmi b/libkvmi
diff --git a/libvmi b/libvmi
diff --git a/qemu b/qemu
diff --git a/vagrant/ansible/playbook_2.yml b/vagrant/ansible/playbook_2.yml
@@ -25,8 +25,10 @@
           DEBUG: 1
       become: false
 
+    # add timeout because the self-tests can hang
+    # and we don't won't to burn Travis CI credits for no reason
     - name: run kvm self-tests
-      command: ./tools/testing/selftests/kvm/x86_64/kvmi_test
+      command: timeout 10s ./tools/testing/selftests/kvm/x86_64/kvmi_test
       args:
         chdir: "{{ root_dir }}/kvm"
 

diff --git a/vagrant/ansible/roles/kvm/tasks/main.yml b/vagrant/ansible/roles/kvm/tasks/main.yml
@@ -29,8 +29,14 @@
   become: false
   when: is_windows
 
-- name: configure kernel using distro's config
-  command: make olddefconfig
+- name: configure kernel using default x86_64 config
+  command: make x86_64_defconfig
+  args:
+    chdir: "{{ root_dir }}/kvm"
+  become: false
+
+- name: configure kernel with KVM guest features
+  command: make kvm_guest.config
   args:
     chdir: "{{ root_dir }}/kvm"
   become: false
@@ -84,6 +90,12 @@
     regexp: '^GRUB_DEFAULT'
     line: 'GRUB_DEFAULT="1>0"'
 
+- name: add kvm.introspection=1 to kernel command line
+  lineinfile:
+    dest: /etc/default/grub.d/99-introspection.cfg
+    line: 'GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT kvm.introspection=1"'
+    create: yes
+
 - name: update GRUB configuration
   command: update-grub
 

diff --git a/vagrant/ansible/roles/vm/tasks/main.yml b/vagrant/ansible/roles/vm/tasks/main.yml
@@ -15,9 +15,7 @@
   include: libvirt.yml
 
 - name: install Packer
-  apt:
-    name: packer
-    state: present
+  include: packer.yml
 
 - name: upload templates
   synchronize:

diff --git a/vagrant/ansible/roles/vm/tasks/packer.yml b/vagrant/ansible/roles/vm/tasks/packer.yml
@@ -0,0 +1,20 @@
+---
+- name: install unzip for unarchive module
+  package:
+    name: unzip
+
+- name: download Packer 1.3.4
+  get_url:
+    url: 'https://releases.hashicorp.com/packer/1.3.4/packer_1.3.4_linux_amd64.zip'
+    dest: /tmp/packer.zip
+
+- name: extract Packer
+  unarchive:
+    src: /tmp/packer.zip
+    dest: /usr/local/bin/
+    remote_src: yes
+
+- name: remove Packer archive
+  file:
+    path: /tmp/packer.zip
+    state: absent
+21 −1		accel/kvm/vmi.c
+1 −0		include/sysemu/vmi-handshake.h
+7 −7		linux-headers/linux/kvm.h