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

Kevin O'Connor kevin at koconnor.net
Wed May 29 00:59:02 CEST 2013


On Tue, May 28, 2013 at 08:28:14PM +0800, Amos Kong wrote:
> Bootindex string passed from qemu:
>  /q35-pcihost at i0cf8/ethernet at 2/ethernet-phy at 0
> 
> We match pci domain by "/pci at i0cf8" in SeaBIOS, but fw_dev_path prefix
> of q35 is "/q35-pcihost at 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 at 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 at 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



More information about the SeaBIOS mailing list