On Tuesday, October 15, 2019, Philippe Mathieu-Daudé <phi...@redhat.com>
wrote:
> From: Hervé Poussineau <hpous...@reactos.org>
>
> PIIX4 structure is now 's'
> PCI device is now 'pci_dev'
> DeviceState is now 'dev'
>
> Acked-by: Michael S. Tsirkin <m...@redhat.com>
> Acked-by: Paolo Bonzini <pbonz...@redhat.com>
> Signed-off-by: Hervé Poussineau <hpous...@reactos.org>
> Message-Id: <20171216090228.28505-6-hpous...@reactos.org>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> hw/isa/piix4.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
>
Reviewed-by: Aleksandar Markovic <amarko...@wavecomp.com>
> diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
> index 3294056cd5..4202243e41 100644
> --- a/hw/isa/piix4.c
> +++ b/hw/isa/piix4.c
> @@ -88,16 +88,17 @@ static const VMStateDescription vmstate_piix4 = {
> }
> };
>
> -static void piix4_realize(PCIDevice *dev, Error **errp)
> +static void piix4_realize(PCIDevice *pci_dev, Error **errp)
> {
> - PIIX4State *d = PIIX4_PCI_DEVICE(dev);
> + DeviceState *dev = DEVICE(pci_dev);
> + PIIX4State *s = DO_UPCAST(PIIX4State, dev, pci_dev);
>
> - 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_dev),
> + pci_address_space_io(pci_dev), errp)) {
> return;
> }
> - piix4_dev = &d->dev;
> - qemu_register_reset(piix4_reset, d);
> + piix4_dev = pci_dev;
> + qemu_register_reset(piix4_reset, s);
> }
>
> int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn)
> --
> 2.21.0
>
>
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
