Patchwork [SeaBIOS] boot: fix fw_dev_path pattern for q35-pcihost

login
register
mail settings
Submitter Amos Kong
Date May 28, 2013, 12:28 p.m.
Message ID <1369744094-21727-1-git-send-email-akong@redhat.com>
Download mbox | patch
Permalink /patch/246855/
State New
Headers show

Comments

Amos Kong - May 28, 2013, 12:28 p.m.
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(-)
Paolo Bonzini - May 28, 2013, 12:36 p.m.
Il 28/05/2013 14:28, Amos Kong ha scritto:
> 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>

Reviewed-by: Paolo Bonzini <pbonzini@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"
>  
>  static char *
>  build_pci_path(char *buf, int max, const char *devname, struct pci_device *pci)
>
Kevin O'Connor - May 28, 2013, 10:59 p.m.
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?

-Kevin
Amos Kong - May 29, 2013, 2:33 a.m.
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
Kevin O'Connor - May 30, 2013, 1:25 a.m.
On Wed, May 29, 2013 at 10:33:54AM +0800, Amos Kong wrote:
> 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:
> > > -#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.

It really can't be changed?

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

That would be preferable.

-Kevin
Gleb Natapov - June 2, 2013, 2:29 p.m.
On Wed, May 29, 2013 at 10:33:54AM +0800, Amos Kong wrote:
> 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.
> 
Why couldn't we? QEMU not been able to generate proper device string is
QEMU bug.

--
			Gleb.
Michael S. Tsirkin - June 2, 2013, 2:59 p.m.
On Sun, Jun 02, 2013 at 05:29:45PM +0300, Gleb Natapov wrote:
> On Wed, May 29, 2013 at 10:33:54AM +0800, Amos Kong wrote:
> > 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.
> > 
> Why couldn't we? QEMU not been able to generate proper device string is
> QEMU bug.
> 
> --
> 			Gleb.


I applied a patch that does just that.
Gleb Natapov - June 2, 2013, 3:39 p.m.
On Sun, Jun 02, 2013 at 05:59:04PM +0300, Michael S. Tsirkin wrote:
> On Sun, Jun 02, 2013 at 05:29:45PM +0300, Gleb Natapov wrote:
> > On Wed, May 29, 2013 at 10:33:54AM +0800, Amos Kong wrote:
> > > 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.
> > > 
> > Why couldn't we? QEMU not been able to generate proper device string is
> > QEMU bug.
> > 
> > --
> > 			Gleb.
> 
> 
> I applied a patch that does just that.
I noticed :) I have many emails to read :(

--
			Gleb.

Patch

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"
 
 static char *
 build_pci_path(char *buf, int max, const char *devname, struct pci_device *pci)