aboutsummaryrefslogtreecommitdiff
path: root/hw/i386
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2013-07-10 18:28:04 +0300
committerMichael S. Tsirkin <mst@redhat.com>2013-07-15 21:26:32 +0300
commitd26d9e14c15837eba2b7447e8d15230bab8e0940 (patch)
tree65a3b7601fad519d1dec3ca04ad2a96b565b46da /hw/i386
parent488f069bd1f3aeb6ee748acb02b7581831bcb3f8 (diff)
pc: don't access fw cfg if NULL
commit f8c457b88d72a48989f190bc3d7b79f4f3b7d11c "pc: pass PCI hole ranges to Guests" broke Xen as it has no fw_cfg. Check for this configuration and boil out. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Tested-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'hw/i386')
-rw-r--r--hw/i386/pc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 80c27d6a30..cb3897e146 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1000,7 +1000,7 @@ typedef struct PcRomPciInfo {
static void pc_fw_cfg_guest_info(PcGuestInfo *guest_info)
{
PcRomPciInfo *info;
- if (!guest_info->has_pci_info) {
+ if (!guest_info->has_pci_info || !guest_info->fw_cfg) {
return;
}