From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 6 Jan 2009 14:00:58 +0000 (+0000)
Subject: rombios: Do not initialise PCI devices after hvmloader.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14019^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e3b7dde95548a6783c67979533976c66ea0e6631;p=xen.git

rombios: Do not initialise PCI devices after hvmloader.

Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>
---

diff --git a/tools/firmware/rombios/rombios.c b/tools/firmware/rombios/rombios.c
index 5e6d7c4140..3ff3f22b70 100644
--- a/tools/firmware/rombios/rombios.c
+++ b/tools/firmware/rombios/rombios.c
@@ -10026,7 +10026,7 @@ pci_routing_table_structure_start:
   db 0 ;; reserved
 pci_routing_table_structure_end:
 
-#if !BX_ROMBIOS32
+#if !BX_ROMBIOS32 && !defined(HVMASSIST)
 pci_irq_list:
   db 11, 10, 9, 5;
 
@@ -10970,7 +10970,7 @@ post_default_ints:
 #if BX_ROMBIOS32
   call rombios32_init
 #else
-#if BX_PCIBIOS
+#if BX_PCIBIOS && !defined(HVMASSIST)
   call pcibios_init_iomem_bases
   call pcibios_init_irqs
 #endif //BX_PCIBIOS