Re: [Qemu-devel] [PATCH] pci: fix pci bridge fw path

["Michael S. Tsirkin" <mst@redhat.com>]

On Fri, Dec 06, 2013 at 12:24:40PM +0100, Gerd Hoffmann wrote:
> qemu uses "pci" as name for pci bridges in the firmware device path.
> seabios expects "pci-bridge".  Result is that bootorder is broken for
> devices behind pci bridges.
> 
> Some googling suggests that "pci-bridge" is the correct one.  At least
> PPC-based Apple machines are using this.  See question "How do I boot
> from a device attached to a PCI card" here:
> 	http://www.netbsd.org/ports/macppc/faq.html
> 
> So lets change qemu to use "pci-bridge" too.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Sounds good but this needs to be enabled for
new machine types only - otherwise guest will read
corrupted data since bootindex is in FW CFG.

Alternatively, extend
04920fc0faa4760f9c4fc0e73b992b768099be70
to work for all fw cfg file entries.

I think the whole boot index thing needs
to be reworked: we also have the long-standing feature request to allow
booting from a device added by hot add.

> ---
>  hw/pci/pci.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index 49eca95..82c11ec 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -1330,7 +1330,7 @@ static const pci_class_desc pci_class_descriptions[] =
>      { 0x0601, "ISA bridge", "isa"},
>      { 0x0602, "EISA bridge", "eisa"},
>      { 0x0603, "MC bridge", "mca"},
> -    { 0x0604, "PCI bridge", "pci"},
> +    { 0x0604, "PCI bridge", "pci-bridge"},
>      { 0x0605, "PCMCIA bridge", "pcmcia"},
>      { 0x0606, "NUBUS bridge", "nubus"},
>      { 0x0607, "CARDBUS bridge", "cardbus"},
> -- 
> 1.8.3.1