From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48960)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1UwwHo-0007Oh-0T
	for qemu-devel@nongnu.org; Wed, 10 Jul 2013 11:26:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1UwwHl-0004Xq-Bg
	for qemu-devel@nongnu.org; Wed, 10 Jul 2013 11:26:31 -0400
Received: from mx1.redhat.com ([209.132.183.28]:12536)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1UwwHl-0004Xe-2h
	for qemu-devel@nongnu.org; Wed, 10 Jul 2013 11:26:29 -0400
Date: Wed, 10 Jul 2013 18:27:35 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20130710152735.GA23778@redhat.com>
References: <1373228271-31223-1-git-send-email-mst@redhat.com>
	<alpine.DEB.2.02.1307101509390.4618@kaball.uk.xensource.com>
	<20130710142132.GC22824@redhat.com>
	<alpine.DEB.2.02.1307101528180.4618@kaball.uk.xensource.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <alpine.DEB.2.02.1307101528180.4618@kaball.uk.xensource.com>
Subject: Re: [Qemu-devel] [PULL v4 00/18] pci,misc enhancements
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: peter.maydell@linaro.org, drjones@redhat.com, qemu-devel@nongnu.org, Paul.Durrant@citrix.com, Anthony Liguori <anthony@codemonkey.ws>, lersek@redhat.com, david@gibson.dropbear.id.au

On Wed, Jul 10, 2013 at 03:30:01PM +0100, Stefano Stabellini wrote:
> On Wed, 10 Jul 2013, Michael S. Tsirkin wrote:
> > On Wed, Jul 10, 2013 at 03:11:27PM +0100, Stefano Stabellini wrote:
> > > On Sun, 7 Jul 2013, Michael S. Tsirkin wrote:
> > > > From: Michael S. Tsirkin <mst@redhat.com>
> > > > 
> > > > Changes from v3:
> > > >     - fix up xen build
> > > > 
> > > > Changes from v2:
> > > >     - rebased to origin/master
> > > >     - fixed up botched posting
> > > > 
> > > > The following changes since commit ab8bf29078e0ab8347e2ff8b4e5542f7a0c751cf:
> > > > 
> > > >   Merge remote-tracking branch 'qemu-kvm/uq/master' into staging (2013-07-03 08:37:00 -0500)
> > > > 
> > > > are available in the git repository at:
> > > > 
> > > > 
> > > >   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anthony
> > > > 
> > > > for you to fetch changes up to 7588e2b0559ae72d3c2952c7807fc05c03099970:
> > > > 
> > > >   pci: Fold host_buses list into PCIHostState functionality (2013-07-07 23:10:57 +0300)
> > > 
> > > This patch series breaks Xen support in QEMU.
> > > Unfortunately QEMU exits at boot time with no output, I'll try to get
> > > back to you with more info.
> > 
> > This is the main change for Xen:
> > 
> > -    bus = pci_find_root_bus(0);
> > +    bus = pci_find_primary_bus();
> > 
> > Could you please try 1ef7a2a2afedbba47e06af5081a8b4bf6dc1cf71
> > that made this change, and 1ef7a2a2afedbba47e06af5081a8b4bf6dc1cf71~1 
> > before it?
> > 
> 
> git bisect tells me that the problem is caused by:
> 
> commit f8c457b88d72a48989f190bc3d7b79f4f3b7d11c
> Author: Michael S. Tsirkin <mst@redhat.com>
> Date:   Mon May 13 20:00:23 2013 +0300
> 
>     pc: pass PCI hole ranges to Guests
>         


Does this help?


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