Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force pci_mode 1 when running as Xen HVM domU to allow cd* to be detected

Browse Source 
correctly. Fixes kern/48770. Thanks to cube@
This commit is contained in:
sborrill 2014-05-06 09:01:26 +00:00
parent e1ea636bac
commit 47b10421a6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arch/x86/pci/pci_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_machdep.c,v 1.65 2014/01/27 23:11:50 jakllsch Exp $ */
/* $NetBSD: pci_machdep.c,v 1.66 2014/05/06 09:01:26 sborrill Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.65 2014/01/27 23:11:50 jakllsch Exp $");
__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.66 2014/05/06 09:01:26 sborrill Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -526,6 +526,7 @@ pci_mode_detect(void)
int i;
pcireg_t idreg;
extern char cpu_brand_string[];
const char *system_vendor, *system_product;
if (pci_mode != -1)
return pci_mode;
@ -555,7 +556,13 @@ pci_mode_detect(void)
return (pci_mode);
}
}
if (memcmp(cpu_brand_string, "QEMU", 4) == 0) {
system_vendor = pmf_get_platform("system-vendor");
system_product = pmf_get_platform("system-product");
if (memcmp(cpu_brand_string, "QEMU", 4) == 0 ||
(system_vendor != NULL && system_product != NULL &&
!strcmp(system_vendor, "Xen") &&
!strcmp(system_product, "HVM domU"))) {
/* PR 45671, https://bugs.launchpad.net/qemu/+bug/897771 */
#ifdef DEBUG
printf("forcing PCI mode 1 for QEMU\n");