| Message ID | 20191015162705.28087-9-philmd@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge | expand |
On Tuesday, October 15, 2019, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > From: Hervé Poussineau <hpoussin@reactos.org> > > PIIX4 structure is now 's' > PCI device is now 'pci_dev' > DeviceState is now 'dev' > > Acked-by: Michael S. Tsirkin <mst@redhat.com> > Acked-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> > Message-Id: <20171216090228.28505-6-hpoussin@reactos.org> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/isa/piix4.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > Reviewed-by: Aleksandar Markovic <amarkovic@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 > > >
On Tuesday, October 15, 2019, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > From: Hervé Poussineau <hpoussin@reactos.org> > > PIIX4 structure is now 's' > PCI device is now 'pci_dev' > DeviceState is now 'dev' > > Acked-by: Michael S. Tsirkin <mst@redhat.com> > Acked-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> > Message-Id: <20171216090228.28505-6-hpoussin@reactos.org> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/isa/piix4.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > Reviewed-by: Aleksandar Markovic <amarkovic@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 > > >
On 15/10/2019 18.26, Philippe Mathieu-Daudé wrote: > From: Hervé Poussineau <hpoussin@reactos.org> > > PIIX4 structure is now 's' > PCI device is now 'pci_dev' > DeviceState is now 'dev' Why? Just for the sake of it? > Acked-by: Michael S. Tsirkin <mst@redhat.com> > Acked-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> > Message-Id: <20171216090228.28505-6-hpoussin@reactos.org> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > 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 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); AFAIK we rather want to get rid of DO_UPCAST in the long run, so please don't introduce new ones! See: https://lists.gnu.org/archive/html/qemu-devel/2015-10/msg05244.html Unless there is a real need for the rename, I'd suggest to rather drop this patch. Thomas
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)