From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39960)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <hpoussin@reactos.org>) id 1eXCFv-0001JQ-66
	for qemu-devel@nongnu.org; Thu, 04 Jan 2018 15:36:55 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <hpoussin@reactos.org>) id 1eXCFk-0001xL-5t
	for qemu-devel@nongnu.org; Thu, 04 Jan 2018 15:36:51 -0500
Received: from iserv.reactos.org ([2a01:4f8:221:4c5::3]:38953)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <hpoussin@reactos.org>)
	id 1eXCFj-0001vV-R2
	for qemu-devel@nongnu.org; Thu, 04 Jan 2018 15:36:40 -0500
References: <20171229142922.31701-1-hpoussin@reactos.org>
	<20171229142922.31701-6-hpoussin@reactos.org>
	<a6bfd7bf-3f09-1a3b-431a-1dfa45214fac@redhat.com>
From: =?UTF-8?Q?Herv=c3=a9_Poussineau?= <hpoussin@reactos.org>
Message-ID: <3097241d-4475-4e4d-d846-767fbf53ecb2@reactos.org>
Date: Thu, 4 Jan 2018 21:36:37 +0100
MIME-Version: 1.0
In-Reply-To: <a6bfd7bf-3f09-1a3b-431a-1dfa45214fac@redhat.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH v3 05/16] piix4: rename some variables in
 realize function
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: Marcel Apfelbaum <marcel@redhat.com>, Aurelien Jarno <aurelien@aurel32.net>, Yongbok Kim <yongbok.kim@mips.com>, "Michael S . Tsirkin" <mst@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org

Le 04/01/2018 à 15:33, Marcel Apfelbaum a écrit :
> On 29/12/2017 16:29, Hervé Poussineau wrote:
>> PIIX4 structure is now 's'
>> PCI device is now 'pci'
> 
> Please don't use 'pci'. Use pci_dev', the former is too wide,

OK, will do.

> 
> Thanks,
> Marcel
> 
>> DeviceState is now 'dev'
>>
>> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
>> ---
>>   hw/isa/piix4.c | 13 +++++++------
>>   1 file changed, 7 insertions(+), 6 deletions(-)
>>
>> diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
>> index 6b8bc3faf0..4f476dc7e6 100644
>> --- a/hw/isa/piix4.c
>> +++ b/hw/isa/piix4.c
>> @@ -87,16 +87,17 @@ static const VMStateDescription vmstate_piix4 = {
>>       }
>>   };
>> -static void piix4_realize(PCIDevice *dev, Error **errp)
>> +static void piix4_realize(PCIDevice *pci, Error **errp)
>>   {
>> -    PIIX4State *d = PIIX4_PCI_DEVICE(dev);
>> +    DeviceState *dev = DEVICE(pci);
>> +    PIIX4State *s = DO_UPCAST(PIIX4State, dev, pci);
>> -    if (!isa_bus_new(DEVICE(d), pci_address_space(dev),
>> -                     pci_address_space_io(dev), errp)) {
>> +    if (!isa_bus_new(dev, pci_address_space(pci),
>> +                     pci_address_space_io(pci), errp)) {
>>           return;
>>       }
>> -    piix4_dev = &d->dev;
>> -    qemu_register_reset(piix4_reset, d);
>> +    piix4_dev = pci;
>> +    qemu_register_reset(piix4_reset, s);
>>   }
>>   int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn)
>>
> 
>