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>

diff --git a/hw/pc.c b/hw/pc.c
index 129e9d934619fe36fbaca6d60d9e11d40344a7dc..93759510fd1bf3bf61b99dfaac3f38b3104820ba 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1047,9 +1047,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++) {