From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:48898)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <akong@redhat.com>) id 1UhWDG-0001gQ-Qy
	for qemu-devel@nongnu.org; Tue, 28 May 2013 22:34:12 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <akong@redhat.com>) id 1UhWDA-0007tn-8X
	for qemu-devel@nongnu.org; Tue, 28 May 2013 22:34:06 -0400
Received: from mx1.redhat.com ([209.132.183.28]:40926)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <akong@redhat.com>) id 1UhWD9-0007tj-WD
	for qemu-devel@nongnu.org; Tue, 28 May 2013 22:34:00 -0400
Date: Wed, 29 May 2013 10:33:54 +0800
From: Amos Kong <akong@redhat.com>
Message-ID: <20130529023354.GA2432@t430s.nay.redhat.com>
References: <1369744094-21727-1-git-send-email-akong@redhat.com>
	<20130528225902.GA27056@morn.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20130528225902.GA27056@morn.localdomain>
Subject: Re: [Qemu-devel] [SeaBIOS PATCH] boot: fix fw_dev_path pattern for
	q35-pcihost
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: Kevin O'Connor <kevin@koconnor.net>
Cc: pbonzini@redhat.com, seabios@seabios.org, qemu-devel@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>

On Tue, May 28, 2013 at 06:59:02PM -0400, Kevin O'Connor wrote:
> On Tue, May 28, 2013 at 08:28:14PM +0800, Amos Kong wrote:
> > Bootindex string passed from qemu:
> >  /q35-pcihost@i0cf8/ethernet@2/ethernet-phy@0
> > 
> > We match pci domain by "/pci@i0cf8" in SeaBIOS, but fw_dev_path prefix
> > of q35 is "/q35-pcihost@i0cf8". So bootindex in qemu commandline
> > doesn't work if it uses q35 machine type.
> > 
> > This patch fixes the pattern to match both original pc-i440fx & q35
> > 
> > Signed-off-by: Amos Kong <akong@redhat.com>
> > ---
> >  src/boot.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/src/boot.c b/src/boot.c
> > index cd9d784..f30d47e 100644
> > --- a/src/boot.c
> > +++ b/src/boot.c
> > @@ -97,7 +97,7 @@ find_prio(const char *glob)
> >      return -1;
> >  }
> >  
> > -#define FW_PCI_DOMAIN "/pci@i0cf8"
> > +#define FW_PCI_DOMAIN "/*pci*@i0cf8"
> 
> The seabios pattern matching code isn't that sophisticated - I think
> this could end up doing something unexpected.  Why does it need to
> change?

If we start a guest with default machine type (pc-i440fx), the prefix
of bootindex string is "/pci@i0cf8", if we start guest with -M q35,
the prefix will become "/q35-pcihost@i0cf8".

We only match "/pci@i0cf8" in seabios, it causes boot priority of q35
devices could not be changed.

We could not change TYPE_Q35_HOST_DEVICE to 'pci' in qemu to adapt
seabios, so fix the pattern.

| qemu/include/hw/pci-host/q35.h:#define TYPE_Q35_HOST_DEVICE "q35-pcihost"


I see glob_prefix() is not powerful, "/*pci*@i0cf8" & "/*@i0cf8" all
work.


Or change TYPE_Q35_HOST_DEVICE to "pci-q35" in qemu, and use
"/pci*@i0cf8" in seabios ?
 
> -Kevin

-- 
			Amos.