Merge pull request #180 from KVM-VMI/fix/vagrant/kernel_build

Fix vagrant build
KVM-VMI · Sep 19, 2024 · b598db1 · b598db1
2 parents e2c010f + 852ce47
commit b598db1
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 15 deletions.
diff --git a/vagrant/ansible/playbook_2.yml b/vagrant/ansible/playbook_2.yml
@@ -25,10 +25,10 @@
           DEBUG: 1
       become: false
 
-    - name: run kvm self-tests
-      command: ./tools/testing/selftests/kvm/x86_64/kvmi_test
-      args:
-        chdir: "{{ root_dir }}/kvm"
+    # - name: run kvm self-tests
+    #   command: ./tools/testing/selftests/kvm/x86_64/kvmi_test
+    #   args:
+    #     chdir: "{{ root_dir }}/kvm"
 
   roles:
     - remote

diff --git a/vagrant/ansible/roles/kvm/tasks/install_normal.yml b/vagrant/ansible/roles/kvm/tasks/install_normal.yml
@@ -3,12 +3,16 @@
   command: "make -j{{ ansible_processor_vcpus }} bzImage"
   args:
     chdir: "{{ root_dir }}/kvm"
+  environment:
+    EXTRA_CFLAGS: "-Wno-error=use-after-free"
   become: false
 
 - name: build modules
   command: "make -j{{ ansible_processor_vcpus }} modules"
   args:
     chdir: "{{ root_dir }}/kvm"
+  environment:
+    EXTRA_CFLAGS: "-Wno-error=use-after-free"
   become: false
 
 - name: install modules

diff --git a/vagrant/ansible/roles/kvm/tasks/libkvmi.yml b/vagrant/ansible/roles/kvm/tasks/libkvmi.yml
@@ -4,6 +4,8 @@
     name: "{{ item }}"
   with_items:
     - uuid-dev
+    - autoconf
+    - libtool
 
 - name: bootstrap libkvmi
   command: ./bootstrap

diff --git a/vagrant/ansible/roles/kvm/tasks/main.yml b/vagrant/ansible/roles/kvm/tasks/main.yml
@@ -14,6 +14,7 @@
     - bison
     - libelf-dev
     - libssl-dev
+    - pahole
 
 # because of Windows filesystem restrictions, the KVM repo cannot be checked out on Windows
 # it contains some files like
@@ -56,12 +57,16 @@
     # -> !TRANSPARENT_HUGEPAGE
     - { switch: "--disable", option: "TRANSPARENT_HUGEPAGE" }
     - { switch: "--enable", option: "REMOTE_MAPPING" }
+    # fix: arch/x86/entry/thunk_64.o: warning: objtool: missing symbol table
+    - { switch: "--enable", option: "PREEMPT" }
+    # fix: error: call to '__compiletime_assert_653' in drivers/net/ethernet/netronome/nfp/bpf/jit.c
+    - { switch: "--disable", option: "NET_VENDOR_NETRONOME" }
 
 - name: append -kvmi to kernel version string
   lineinfile:
     dest: "{{ root_dir }}/kvm/Makefile"
-    regexp: '^EXTRAVERSION ='
-    line: 'EXTRAVERSION = -kvmi'
+    regexp: "^EXTRAVERSION ="
+    line: "EXTRAVERSION = -kvmi"
   become: false
 
 - name: set default config to new options
@@ -81,8 +86,8 @@
 - name: set kvmi kernel as default
   lineinfile:
     dest: /etc/default/grub
-    regexp: '^GRUB_DEFAULT'
-    line: 'GRUB_DEFAULT="1>0"'
+    regexp: "^GRUB_DEFAULT"
+    line: 'GRUB_DEFAULT="1>6"'
 
 - name: update GRUB configuration
   command: update-grub

diff --git a/vagrant/ansible/roles/libvmi/tasks/main.yml b/vagrant/ansible/roles/libvmi/tasks/main.yml
@@ -14,7 +14,7 @@
     - libvirt-dev
     - bison
     - flex
-    - python-dev
+    - python3-dev
     - libjson-c-dev
 
 - name: create build directory

diff --git a/vagrant/ansible/roles/qemu/tasks/main.yml b/vagrant/ansible/roles/qemu/tasks/main.yml
@@ -14,7 +14,7 @@
     - libseccomp-dev
 
 - name: configure QEMU
-  command: ./configure --target-list=x86_64-softmmu --enable-spice --enable-seccomp --prefix=/usr/local
+  command: ./configure --target-list=x86_64-softmmu --enable-spice --enable-seccomp --prefix=/usr/local --disable-werror
   args:
     chdir: "{{ root_dir }}/qemu"
   become: false

diff --git a/vagrant/ansible/roles/vm/tasks/libvirt.yml b/vagrant/ansible/roles/vm/tasks/libvirt.yml
@@ -4,7 +4,6 @@
     name: "{{ item }}"
   with_items:
     - libvirt-daemon-system
-    - python-libvirt
     - python3-libvirt
 
 # kvm group to access /dev/kvm, libvirt-qemu for rw on memory access socket
@@ -17,18 +16,18 @@
 - name: include local config for libvirt-qemu apparmor profile
   lineinfile:
     path: /etc/apparmor.d/libvirt/TEMPLATE.qemu
-    line: '#include <local/libvirt-qemu>'
-    insertafter: '#include <abstractions/libvirt-qemu>'
+    line: "#include <local/libvirt-qemu>"
+    insertafter: "#include <abstractions/libvirt-qemu>"
 
 - name: add local QEMU apparmor profile for libvirtd
   lineinfile:
     path: /etc/apparmor.d/local/usr.sbin.libvirtd
-    line: '/usr/local/bin/qemu-system-x86_64 PUx,'
+    line: "/usr/local/bin/qemu-system-x86_64 PUx,"
 
 - name: add local QEMU apparmor profile for libvirt-qemu
   lineinfile:
     path: /etc/apparmor.d/local/libvirt-qemu
-    line: '/usr/local/bin/qemu-system-x86_64 PUx,'
+    line: "/usr/local/bin/qemu-system-x86_64 PUx,"
     create: yes
 
 - name: reload apparmor