Re: kern/48770

[Quentin Garnier <cube%cubidou.net@localhost>]

The following reply was made to PR kern/48770; it has been noted by GNATS.

From: Quentin Garnier <cube%cubidou.net@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: kern/48770
Date: Thu, 1 May 2014 23:04:41 +0000

 On Thu, May 01, 2014 at 07:12:45PM +0000, Quentin Garnier wrote:
 > The workaround for 45671 doesn't apply to a Xen HVM (because the actual
 > CPU is seen).  I think it'd be better to use pmf_get_platform to check
 > if "system-vendor" is "Xen" and "system-product" is "HVM domU" because
 > that's what you get on XenServer 6.2 according to my dmesg(8) output.
 
 This should do it.  A test for the version can be added if necessary.
 
 Index: pci_machdep.c
 ===================================================================
 RCS file: /cvsroot/src/sys/arch/x86/pci/pci_machdep.c,v
 retrieving revision 1.65
 diff -u -u -r1.65 pci_machdep.c
 --- pci_machdep.c       27 Jan 2014 23:11:50 -0000      1.65
 +++ pci_machdep.c       1 May 2014 23:02:56 -0000
 @@ -555,7 +555,9 @@
                         return (pci_mode);
                 }
         }
 -        if (memcmp(cpu_brand_string, "QEMU", 4) == 0) {
 +        if (memcmp(cpu_brand_string, "QEMU", 4) == 0 ||
 +           (!strcmp(pmf_get_platform("system-vendor"), "Xen") &&
 +            !strcmp(pmf_get_platform("system-product"), "HVM domU"))) {
                 /* PR 45671, https://bugs.launchpad.net/qemu/+bug/897771 */
  #ifdef DEBUG
                 printf("forcing PCI mode 1 for QEMU\n");
 
 -- 
 Quentin Garnier - cube%cubidou.net@localhost
 "See the look on my face from staying too long in one place
 [...] every time the morning breaks I know I'm closer to falling"
 KT Tunstall, Saving My Face, Drastic Fantastic, 2007.