[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 13/32] piix4: convert reset function to QOM
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 13/32] piix4: convert reset function to QOM |
Date: |
Tue, 15 Oct 2019 18:26:46 +0200 |
From: Hervé Poussineau <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/isa/piix4.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index c3a2bd0d70..8998b0ca47 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -48,10 +48,10 @@ typedef struct PIIX4State {
#define PIIX4_PCI_DEVICE(obj) \
OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE)
-static void piix4_reset(void *opaque)
+static void piix4_reset(DeviceState *dev)
{
- PIIX4State *d = opaque;
- uint8_t *pci_conf = d->dev.config;
+ PIIX4State *s = PIIX4_PCI_DEVICE(dev);
+ uint8_t *pci_conf = s->dev.config;
pci_conf[0x04] = 0x07; // master, memory and I/O
pci_conf[0x05] = 0x00;
@@ -165,7 +165,6 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp)
isa_bus_irqs(isa_bus, s->isa);
piix4_dev = pci_dev;
- qemu_register_reset(piix4_reset, s);
}
static void piix4_class_init(ObjectClass *klass, void *data)
@@ -177,6 +176,7 @@ static void piix4_class_init(ObjectClass *klass, void *data)
k->vendor_id = PCI_VENDOR_ID_INTEL;
k->device_id = PCI_DEVICE_ID_INTEL_82371AB_0;
k->class_id = PCI_CLASS_BRIDGE_ISA;
+ dc->reset = piix4_reset;
dc->desc = "ISA bridge";
dc->vmsd = &vmstate_piix4;
/*
--
2.21.0
- Re: [PATCH 08/32] piix4: rename some variables in realize function, (continued)
- [PATCH 09/32] piix4: add Reset Control Register, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 10/32] piix4: add a i8259 interrupt controller as specified in datasheet, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 11/32] Revert "irq: introduce qemu_irq_proxy()", Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 12/32] piix4: rename PIIX4 object to piix4-isa, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 13/32] piix4: convert reset function to QOM,
Philippe Mathieu-Daudé <=
- [PATCH 14/32] piix4: add a i8257 dma controller as specified in datasheet, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 15/32] piix4: add a i8254 pit controller as specified in datasheet, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 16/32] piix4: add a mc146818rtc controller as specified in datasheet, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 17/32] hw/mips/mips_malta: Create IDE hard drive array dynamically, Philippe Mathieu-Daudé, 2019/10/15