When xen_platform_pci=0 also disable fixed Xen platform ioports

disable_pf should affect the platform's fixed ioport (used for device
hot unplug etc.)

Contributed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
(cherry picked from commit e5d14857cd67490bf956d97c8888c0be95ed3f78)

diff --git a/hw/pc.c b/hw/pc.c
index 9a5637ceee5bb75c2f7e282713d33e75d3ad2684..6c71ad837783bec28923fa049f7df297acc20a50 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1048,9 +1048,10 @@ vga_bios_error:
 #endif /* !CONFIG_DM */
     if (pci_enabled) {
         disable_pf = xenstore_parse_disable_pf_config();
-        if (disable_pf != 1)
+        if (disable_pf != 1) {
             pci_xen_platform_init(pci_bus);
-        platform_fixed_ioport_init();
+            platform_fixed_ioport_init();
+        }
     }
 
     for(i = 0; i < MAX_SERIAL_PORTS; i++) {