From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53255)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <marcel@redhat.com>) id 1ZydVg-0001dw-Ou
	for qemu-devel@nongnu.org; Tue, 17 Nov 2015 05:29:13 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <marcel@redhat.com>) id 1ZydVc-00082I-OP
	for qemu-devel@nongnu.org; Tue, 17 Nov 2015 05:29:12 -0500
Received: from mx1.redhat.com ([209.132.183.28]:42044)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <marcel@redhat.com>) id 1ZydVc-00082A-Ju
	for qemu-devel@nongnu.org; Tue, 17 Nov 2015 05:29:08 -0500
References: <1447601946-31248-1-git-send-email-marcel@redhat.com>
	<1447601946-31248-4-git-send-email-marcel@redhat.com>
	<20151116182603.GA4180@thinpad.lan.raisama.net>
From: Marcel Apfelbaum <marcel@redhat.com>
Message-ID: <564B0170.2010106@redhat.com>
Date: Tue, 17 Nov 2015 12:29:04 +0200
MIME-Version: 1.0
In-Reply-To: <20151116182603.GA4180@thinpad.lan.raisama.net>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH V2 3/4] hw/pc: query both q35 and i440fx bus
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Eduardo Habkost <ehabkost@redhat.com>
Cc: mst@redhat.com, qemu-devel@nongnu.org, kraxel@redhat.com, pbonzini@redhat.com, imammedo@redhat.com, rth@twiddle.net

On 11/16/2015 08:26 PM, Eduardo Habkost wrote:
> On Sun, Nov 15, 2015 at 05:39:05PM +0200, Marcel Apfelbaum wrote:
>> Look for pxb devices on both i386 machines.
>>
>> Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
> [...]
>> diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
>> index c81507d..2fbbcd3 100644
>> --- a/hw/pci-host/q35.c
>> +++ b/hw/pci-host/q35.c
>> @@ -511,6 +511,14 @@ static void mch_realize(PCIDevice *d, Error **errp)
>>       }
>>   }
>>
>> +PCIBus *find_q35(void)
>> +{
>> +    PCIHostState *s = OBJECT_CHECK(PCIHostState,
>> +                                   object_resolve_path("/machine/q35", NULL),
>> +                                   TYPE_PCI_HOST_BRIDGE);
>

Hi Eduardo,

Thanks for the review.

> Why not use the PCI_HOST_BRIDGE macro?

Do you mean ?
	PCIHostState *s = PCI_HOST_BRIDGE(object_resolve_path("/machine/q35", NULL));

I can use it, thanks -- I was doing the usual copy/paste of the i440fx counterpart :)

>
>> +    return s ? s->bus : NULL;
>> +}
>> +
>>   uint64_t mch_mcfg_base(void)
>>   {
>>       bool ambiguous;
>> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
>> index 4bbc0ff..95d7610 100644
>> --- a/include/hw/i386/pc.h
>> +++ b/include/hw/i386/pc.h
>> @@ -242,6 +242,15 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type,
>>                       MemoryRegion *ram_memory);
>>
>>   PCIBus *find_i440fx(void);
>> +PCIBus *find_q35(void);
>> +
>> +static inline PCIBus *find_pc(void)
>> +{
>> +    PCIBus *bus = find_i440fx();
>> +
>> +    return bus ? bus : find_q35();
>
> Have you considered a /machine/pci link, or (in case you don't
> want to add something new to the QOM tree) a simple
> PCMachineState::pci_bus struct field?

This is a nice idea, I like the PC machine state, I'll look into it.

Thanks,
Marcel

>