From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Damien Hedde" <damien.hedde@greensocs.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
qemu-trivial@nongnu.org, "Markus Armbruster" <armbru@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH 03/11] hw/isa/piix4: Convert reset handler to DeviceReset
Date: Thu, 26 Sep 2019 17:17:25 +0200 [thread overview]
Message-ID: <20190926151733.25349-4-philmd@redhat.com> (raw)
In-Reply-To: <20190926151733.25349-1-philmd@redhat.com>
Convert the reset handler into a proper Device reset method.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/isa/piix4.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 3294056cd5..890d999abf 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -28,7 +28,6 @@
#include "hw/isa/isa.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
-#include "sysemu/reset.h"
PCIDevice *piix4_dev;
@@ -40,9 +39,9 @@ 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_isa_reset(DeviceState *dev)
{
- PIIX4State *d = opaque;
+ PIIX4State *d = PIIX4_PCI_DEVICE(dev);
uint8_t *pci_conf = d->dev.config;
pci_conf[0x04] = 0x07; // master, memory and I/O
@@ -97,7 +96,6 @@ static void piix4_realize(PCIDevice *dev, Error **errp)
return;
}
piix4_dev = &d->dev;
- qemu_register_reset(piix4_reset, d);
}
int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn)
@@ -118,6 +116,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_isa_reset;
dc->desc = "ISA bridge";
dc->vmsd = &vmstate_piix4;
/*
--
2.20.1
next prev parent reply other threads:[~2019-09-26 15:26 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-26 15:17 [PATCH 00/11] hw: Convert various reset() handler to DeviceReset Philippe Mathieu-Daudé
2019-09-26 15:17 ` [PATCH 01/11] hw/acpi/piix4: Convert reset " Philippe Mathieu-Daudé
2019-10-04 11:32 ` Igor Mammedov
2019-09-26 15:17 ` [PATCH 02/11] hw/ide/piix: " Philippe Mathieu-Daudé
2019-09-26 15:17 ` Philippe Mathieu-Daudé [this message]
2019-09-26 15:17 ` [PATCH 04/11] hw/pci-host/piix: " Philippe Mathieu-Daudé
2019-09-26 15:17 ` [PATCH 05/11] hw/ide/sii3112: " Philippe Mathieu-Daudé
2019-09-26 15:17 ` [PATCH 06/11] hw/ide/via82c: " Philippe Mathieu-Daudé
2019-09-26 15:17 ` [PATCH 07/11] hw/isa/vt82c686: " Philippe Mathieu-Daudé
2019-09-26 15:17 ` [PATCH 08/11] hw/input/lm832x: " Philippe Mathieu-Daudé
2019-09-26 15:17 ` [PATCH 09/11] hw/pci-host/bonito: " Philippe Mathieu-Daudé
2019-09-26 15:17 ` [PATCH 10/11] hw/timer/etraxfs: " Philippe Mathieu-Daudé
2019-09-26 15:17 ` [PATCH 11/11] hw/misc/vmcoreinfo: " Philippe Mathieu-Daudé
2019-09-26 16:02 ` Philippe Mathieu-Daudé
2019-10-08 13:32 ` Eduardo Habkost
2019-10-09 9:04 ` Damien Hedde
2019-10-09 13:51 ` Peter Maydell
2019-09-27 8:47 ` [PATCH 00/11] hw: Convert various reset() " no-reply
2019-10-05 21:46 ` Michael S. Tsirkin
2019-10-07 10:01 ` Philippe Mathieu-Daudé
2019-10-07 21:24 ` Eduardo Habkost
2019-10-08 9:47 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190926151733.25349-4-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=armbru@redhat.com \
--cc=damien.hedde@greensocs.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.