From b2ee0702ff8e8e556f7fe39b81f43e413070dc59 Mon Sep 17 00:00:00 2001 From: Krystian Lewandowski Date: Wed, 15 Nov 2017 18:29:06 +0100 Subject: [PATCH] pci server crashes during boot on Qubes OS I tried to launch Minix3 in Qubes OS. While there is no problem to boot minix as a qube (in Qubes OS terminology) before 3641562, it fails with the commit (and after). I didn't digg into PCI handling but this change fixes the problem. Minix handles NULL case from pci_subclass_name. Change-Id: I162424d92b613598e6eb845a71f90a02e31041db --- sys/dev/pci/pci_subr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/pci_subr.c b/sys/dev/pci/pci_subr.c index 65372632f..462fd5672 100644 --- a/sys/dev/pci/pci_subr.c +++ b/sys/dev/pci/pci_subr.c @@ -617,7 +617,11 @@ pci_subclass_name(pcireg_t reg) subclassp++; } - return subclassp->name; + if (subclassp) { + return subclassp->name; + } else { + return NULL; + } } #endif /* defined(__minix) && defined(_PCI_SERVER) */ -- 2.44.0