From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 18 Feb 2010 15:36:29 +0000 (+0000)
Subject: When xen_platform_pci=0 also disable fixed Xen platform ioports
X-Git-Tag: xen-4.0.0-rc5~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e5d14857cd67490bf956d97c8888c0be95ed3f78;p=qemu-xen-4.4-testing.git

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 129e9d934..93759510f 100644
--- 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++) {