From d4c238c45ecc319738743f259ff47be1934ac4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Mon, 11 Jan 2016 19:34:10 +0100
Subject: [PATCH] Unload USB controllers drivers in USB VM before going to
 sleep

Many USB controllers doesn't play nice with suspend when attached to PV
domain, so unload those drivers by default. This is just a configuration
file, so user is free to change this setting if his/shes particular
controller doesn't have such problem.

Fixes QubesOS/qubes-issues#1565
---
 Makefile                            | 1 +
 misc/qubes-suspend-module-blacklist | 6 ++++++
 rpm_spec/core-vm.spec               | 1 +
 3 files changed, 8 insertions(+)
 create mode 100644 misc/qubes-suspend-module-blacklist

diff --git a/Makefile b/Makefile
index b5a3c25..ea8bdef 100644
--- a/Makefile
+++ b/Makefile
@@ -216,6 +216,7 @@ install-common:
 	install qubes-rpc/qrun-in-vm $(DESTDIR)$(LIBDIR)/qubes
 	install qubes-rpc/sync-ntp-clock $(DESTDIR)$(LIBDIR)/qubes
 	install qubes-rpc/prepare-suspend $(DESTDIR)$(LIBDIR)/qubes
+	install -m 0644 misc/qubes-suspend-module-blacklist $(DESTDIR)/etc/qubes-suspend-module-blacklist
 	install -d $(DESTDIR)/$(KDESERVICEDIR)
 	install -m 0644 qubes-rpc/{qvm-copy.desktop,qvm-move.desktop,qvm-dvm.desktop} $(DESTDIR)/$(KDESERVICEDIR)
 	install -d $(DESTDIR)/etc/qubes-rpc
diff --git a/misc/qubes-suspend-module-blacklist b/misc/qubes-suspend-module-blacklist
new file mode 100644
index 0000000..cec4fd7
--- /dev/null
+++ b/misc/qubes-suspend-module-blacklist
@@ -0,0 +1,6 @@
+# You can list here modules you want to be unloaded before going to sleep. This
+# file is used only if the VM has any PCI device assigned. Modules will be
+# automatically loaded after resume.
+
+ehci_pci
+xhci_pci
diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index 384b271..75568a2 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -359,6 +359,7 @@ rm -f %{name}-%{version}
 %config(noreplace) /etc/tinyproxy/updates-blacklist
 %config(noreplace) /etc/udev/rules.d/50-qubes-misc.rules
 %config(noreplace) /etc/udev/rules.d/99-qubes-network.rules
+%config(noreplace) /etc/qubes-suspend-module-blacklist
 /etc/xdg/autostart/00-qubes-show-hide-nm-applet.desktop
 /etc/xen/scripts/vif-route-qubes
 %config(noreplace) /etc/yum.conf.d/qubes-proxy.conf