From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UxFPM-0007uj-9T for qemu-devel@nongnu.org; Thu, 11 Jul 2013 07:51:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UxFPG-0004ps-03 for qemu-devel@nongnu.org; Thu, 11 Jul 2013 07:51:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26512) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UxFPF-0004pa-PL for qemu-devel@nongnu.org; Thu, 11 Jul 2013 07:51:29 -0400 Date: Thu, 11 Jul 2013 14:52:40 +0300 From: "Michael S. Tsirkin" Message-ID: <20130711115240.GA24956@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] pc: don't access fw cfg if NULL List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Stefano Stabellini , Igor Mammedov , Paolo Bonzini , Andreas =?iso-8859-1?Q?F=E4rber?= 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 Tested-by: Stefano Stabellini --- Anthony, could you fast-track this into master please? Thanks! hw/i386/pc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 9f9207d..c7fc475 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -999,7 +999,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; } -- MST