[QEMU PATCH v2] pci: set firmware name of q35 to pci

[Amos Kong]

In QEMU, we set the firmware name of pc-i440fx to 'pci', and the
typename 'q35-pcihost' is set to the firmware name of q35 by default.

The seabios matches pci devices by "/pci/@i0cf8", so q35 device
could not be identified, seabios fails to adjust the boot priority
of q35 devices.

This patch sets firmware name of q35 to 'pci'.

Signed-off-by: Michael S. Tsirkin 
Signed-off-by: Amos Kong 
---
v2: just set the fw_name, no need to change seabios
---
 hw/pci-host/q35.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 8467f86..24df6b5 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -76,6 +76,7 @@ static void q35_host_class_init(ObjectClass *klass, void *data)

k->init = q35_host_init;
     dc->props = mch_props;
+    dc->fw_name = "pci";
 }

static void q35_host_initfn(Object *obj)

[Michael S. Tsirkin]

On Thu, May 30, 2013 at 03:25:17PM +0800, Amos Kong wrote:
> In QEMU, we set the firmware name of pc-i440fx to 'pci', and the
> typename 'q35-pcihost' is set to the firmware name of q35 by default.
>
> The seabios matches pci devices by "/pci/@i0cf8", so q35 device
> could not be identified, seabios fails to adjust the boot priority
> of q35 devices.
>
> This patch sets firmware name of q35 to 'pci'.
>
> Signed-off-by: Michael S. Tsirkin 
> Signed-off-by: Amos Kong

Does this imply
Tested-by: Amos Kong

?
> v2: just set the fw_name, no need to change seabios
>
> hw/pci-host/q35.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
> index 8467f86..24df6b5 100644
> --- a/hw/pci-host/q35.c
> +++ b/hw/pci-host/q35.c
> @@ -76,6 +76,7 @@ static void q35_host_class_init(ObjectClass *klass, void *data)
>  k->init = q35_host_init;
>  dc->props = mch_props;
> dc->fw_name = "pci";
>
> }
> static void q35_host_initfn(Object *obj)
>
> 1.8.1.4

[Michael S. Tsirkin]

On Thu, May 30, 2013 at 03:25:17PM +0800, Amos Kong wrote:
> In QEMU, we set the firmware name of pc-i440fx to 'pci', and the
> typename 'q35-pcihost' is set to the firmware name of q35 by default.
>
> The seabios matches pci devices by "/pci/@i0cf8", so q35 device
> could not be identified, seabios fails to adjust the boot priority
> of q35 devices.
>
> This patch sets firmware name of q35 to 'pci'.
>
> Signed-off-by: Michael S. Tsirkin 
> Signed-off-by: Amos Kong

I've applied this already.
> v2: just set the fw_name, no need to change seabios
>
> hw/pci-host/q35.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
> index 8467f86..24df6b5 100644
> --- a/hw/pci-host/q35.c
> +++ b/hw/pci-host/q35.c
> @@ -76,6 +76,7 @@ static void q35_host_class_init(ObjectClass *klass, void *data)
>  k->init = q35_host_init;
>  dc->props = mch_props;
> dc->fw_name = "pci";
>
> }
> static void q35_host_initfn(Object *obj)
>
> 1.8.1.4