From: Michael S. Tsirkin <mst@redhat.com>
Date: Wed, 10 Jul 2013 15:28:04 +0000 (+0300)
Subject: pc: don't access fw cfg if NULL
X-Git-Tag: v1.6.0-rc0~128^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d26d9e14c15837eba2b7447e8d15230bab8e0940;p=qemu.git

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>
---

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 80c27d6a3..cb3897e14 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;
     }