[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 14/16] piix4: convert reset function to QOM
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v3 14/16] piix4: convert reset function to QOM |
Date: |
Fri, 29 Dec 2017 15:29:20 +0100 |
Signed-off-by: Hervé Poussineau <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 64526e1bb8..c6691a6914 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -56,10 +56,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;
@@ -230,7 +230,6 @@ static void piix4_realize(PCIDevice *pci, Error **errp)
isa_init_irq(ISA_DEVICE(&s->rtc), &s->rtc.irq, RTC_ISA_IRQ);
piix4_dev = pci;
- qemu_register_reset(piix4_reset, s);
}
static void piix4_init(Object *obj)
@@ -264,6 +263,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.11.0
- [Qemu-devel] [PATCH v3 00/16] piix4: cleanup and improvements, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 14/16] piix4: convert reset function to QOM,
Hervé Poussineau <=
- [Qemu-devel] [PATCH v3 16/16] piix4: we can now instanciate a PIIX4 with -device, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 10/16] piix4: add a i8042 keyboard/mouse controller as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 09/16] piix4: add a i8254 pit controller as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 02/16] serial/parallel: move object structures to header file, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 07/16] piix4: add a i8259 interrupt controller as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 06/16] piix4: add Reset Control Register, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 11/16] piix4: add a floppy controller, 1 parallel port and 2 serial ports, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 05/16] piix4: rename some variables in realize function, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 04/16] mc146818rtc: always register rtc to rtc list, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 13/16] piix4: add a speaker as specified in datasheet, Hervé Poussineau, 2017/12/29