Re: [Qemu-ppc] [Qemu-devel] [PATCH RFC 10/17] hw/pci: removed 'rootbus nr is 0' assumption from qmp_pci_query

[Michael S. Tsirkin]

On Thu, Jan 22, 2015 at 09:52:36PM +0200, Marcel Apfelbaum wrote:
> From: Marcel Apfelbaum <address@hidden>
> 
> Use the newer pci_bus_num to correctly get the root bus number.
> 
> Signed-off-by: Marcel Apfelbaum <address@hidden>


OK for now, but really bus numbers are a wrong thing to
use for QMP. In particular they are often guest-assigned.

> ---
>  hw/pci/pci.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index dccb3d1..bf31168 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -1251,7 +1251,8 @@ PciInfoList *qmp_query_pci(Error **errp)
>  
>      QLIST_FOREACH(host_bridge, &pci_host_bridges, next) {
>          info = g_malloc0(sizeof(*info));
> -        info->value = qmp_query_pci_bus(host_bridge->bus, 0);
> +        info->value = qmp_query_pci_bus(host_bridge->bus,
> +                                        pci_bus_num(host_bridge->bus));
>  
>          /* XXX: waiting for the qapi to support GSList */
>          if (!cur_item) {
> -- 
> 2.1.0