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

diff --git a/sys/dev/pci/pci_subr.c b/sys/dev/pci/pci_subr.c
index 65372632fbe5cb6d265b255c1dae0b3e3509e5b7..462fd5672df9e36dc03d86c6fbe5bc93d71a2864 100644 (file)
--- 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) */