[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 05/16] piix4: rename some variables in realize fu
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v4 05/16] piix4: rename some variables in realize function |
Date: |
Sat, 6 Jan 2018 16:37:19 +0100 |
PIIX4 structure is now 's'
PCI device is now 'pci_dev'
DeviceState is now 'dev'
Acked-by: Michael S. Tsirkin <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
---
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..7b231b704b 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_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.11.0
- [Qemu-devel] [PATCH v4 06/16] piix4: add Reset Control Register, (continued)
- [Qemu-devel] [PATCH v4 06/16] piix4: add Reset Control Register, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 03/16] mc146818rtc: move structure to header file, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 02/16] serial/parallel: move object structures to header file, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 07/16] piix4: add a i8259 interrupt controller as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 10/16] piix4: add a i8042 keyboard/mouse controller as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 08/16] piix4: add a i8257 dma controller as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 01/16] fdc: move object structures to header file, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 05/16] piix4: rename some variables in realize function,
Hervé Poussineau <=
- [Qemu-devel] [PATCH v4 09/16] piix4: add a i8254 pit controller as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 04/16] mc146818rtc: always register rtc to rtc list, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 11/16] piix4: add a floppy controller, 1 parallel port and 2 serial ports, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 13/16] piix4: add a speaker as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 12/16] piix4: add a mc146818rtc controller as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 15/16] piix4: rename PIIX4 object to piix4-isa, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 14/16] piix4: convert reset function to QOM, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 16/16] piix4: we can now instanciate a PIIX4 with -device, Hervé Poussineau, 2018/01/06