[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/15] piix4: rename some variables in realize funct
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH 05/15] piix4: rename some variables in realize function |
Date: |
Sat, 16 Dec 2017 10:02:18 +0100 |
PIIX4 structure is now 's'
PCI device is now 'pci'
DeviceState is now 'dev'
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..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)
--
2.11.0
- [Qemu-devel] [PATCH 01/15] fdc: move object structures to header file, (continued)
- [Qemu-devel] [PATCH 01/15] fdc: move object structures to header file, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 13/15] piix4: add a speaker as specified in datasheet, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 11/15] piix4: add a floppy controller, 1 parallel port and 2 serial ports, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 07/15] piix4: add a i8259 interrupt controller as specified in datasheet, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 06/15] piix4: add Reset Control Register, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 15/15] piix4: we can now instanciate a PIIX4 with -device, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 12/15] piix4: add a mc146818rtc controller as specified in datasheet, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 09/15] piix4: add a i8254 pit controller as specified in datasheet, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 14/15] piix4: rename PIIX4 object to piix4-isa, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 04/15] mc146818rtc: always register rtc to rtc list, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 05/15] piix4: rename some variables in realize function,
Hervé Poussineau <=
- Re: [Qemu-devel] [PATCH 00/15] piix4: cleanup and improvements, no-reply, 2017/12/17
- [Qemu-devel] [PATCH 00/15] piix4: cleanup and improvements, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH v2 01/15] fdc: move object structures to header file, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH v2 02/15] serial/parallel: move object structures to header file, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH v2 03/15] mc146818rtc: move structure to header file, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH v2 05/15] piix4: rename some variables in realize function, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH v2 04/15] mc146818rtc: always register rtc to rtc list, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH v2 06/15] piix4: add Reset Control Register, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH v2 07/15] piix4: add a i8259 interrupt controller as specified in datasheet, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH v2 08/15] piix4: add a i8257 dma controller as specified in datasheet, Hervé Poussineau, 2017/12/16