diff --git a/roles/win10/files/archlinux_iommu.conf b/roles/win10/files/archlinux_iommu.conf deleted file mode 100644 index f3861d3..0000000 --- a/roles/win10/files/archlinux_iommu.conf +++ /dev/null @@ -1,6 +0,0 @@ -title Archlinux w/ VFIO -linux /vmlinuz-linux -initrd /intel-ucode.img -initrd /initramfs-linux.img -options mitigations=off intel_iommu=on iommu=pt intel_iommu=igfx_off experimental_zcopytx=1 kvm.ignore_msrs=1 acpi_backlight=none root=LABEL=ARCHLINUX rw - diff --git a/roles/win10/tasks/main.yml b/roles/win10/tasks/main.yml index 66e2ec9..7f540aa 100644 --- a/roles/win10/tasks/main.yml +++ b/roles/win10/tasks/main.yml @@ -8,7 +8,6 @@ - virt-manager - python-evdev - python-pyudev - - vendor-reset-dkms-git notify: - restart libvirtd.service - restart virtlogd.socket @@ -18,6 +17,7 @@ name: - vfio-isolate - persistent-evdev-git + - vendor-reset-dkms-git - name: create hooks directory file: @@ -55,14 +55,8 @@ dest: /etc/modprobe.d/kvm.conf notify: regenerate linux initramfs -- name: configure vfio-pci kernel module - template: - src: modprobe/vfio.conf.j2 - dest: /etc/modprobe.d/vfio.conf - notify: regenerate linux initramfs - - name: install boot entry - copy: + template: src: archlinux_iommu.conf dest: /boot/loader/entries/archlinux_iommu.conf diff --git a/roles/win10/templates/archlinux_iommu.conf b/roles/win10/templates/archlinux_iommu.conf new file mode 100644 index 0000000..a8c3824 --- /dev/null +++ b/roles/win10/templates/archlinux_iommu.conf @@ -0,0 +1,5 @@ +title Archlinux w/ VFIO +linux /vmlinuz-linux +initrd /intel-ucode.img +initrd /initramfs-linux.img +options mitigations=off vfio-pci.ids={{ ','.join(vfio_pci_ids) }} intel_iommu=on iommu=pt intel_iommu=igfx_off experimental_zcopytx=1 kvm.ignore_msrs=1 acpi_backlight=none root=LABEL=ARCHLINUX rw diff --git a/roles/win10/templates/modprobe/vfio.conf.j2 b/roles/win10/templates/modprobe/vfio.conf.j2 deleted file mode 100644 index 06673b9..0000000 --- a/roles/win10/templates/modprobe/vfio.conf.j2 +++ /dev/null @@ -1 +0,0 @@ -options vfio-pci ids={{ ','.join(vfio_pci_ids) }} diff --git a/roles/win10/templates/win10.xml b/roles/win10/templates/win10.xml index d6803ad..98a7513 100644 --- a/roles/win10/templates/win10.xml +++ b/roles/win10/templates/win10.xml @@ -87,7 +87,7 @@ /usr/bin/qemu-system-x86_64 - +
@@ -100,7 +100,7 @@ - +
@@ -207,7 +207,11 @@