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>,
qemu-block@nongnu.org, qemu-trivial@nongnu.org,
"John Snow" <jsnow@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
qemu-ppc@nongnu.org, "Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH 05/11] hw/ide/sii3112: Convert reset handler to DeviceReset
Date: Thu, 26 Sep 2019 17:17:27 +0200 [thread overview]
Message-ID: <20190926151733.25349-6-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/ide/sii3112.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c
index 2181260531..06605d7af2 100644
--- a/hw/ide/sii3112.c
+++ b/hw/ide/sii3112.c
@@ -15,7 +15,6 @@
#include "qemu/osdep.h"
#include "hw/ide/pci.h"
#include "qemu/module.h"
-#include "sysemu/reset.h"
#include "trace.h"
#define TYPE_SII3112_PCI "sii3112"
@@ -237,9 +236,9 @@ static void sii3112_set_irq(void *opaque, int channel, int level)
sii3112_update_irq(s);
}
-static void sii3112_reset(void *opaque)
+static void sii3112_reset(DeviceState *dev)
{
- SiI3112PCIState *s = opaque;
+ SiI3112PCIState *s = SII3112_PCI(dev);
int i;
for (i = 0; i < 2; i++) {
@@ -290,7 +289,6 @@ static void sii3112_pci_realize(PCIDevice *dev, Error **errp)
s->bmdma[i].bus = &s->bus[i];
ide_register_restart_cb(&s->bus[i]);
}
- qemu_register_reset(sii3112_reset, s);
}
static void sii3112_pci_class_init(ObjectClass *klass, void *data)
@@ -303,6 +301,7 @@ static void sii3112_pci_class_init(ObjectClass *klass, void *data)
pd->class_id = PCI_CLASS_STORAGE_RAID;
pd->revision = 1;
pd->realize = sii3112_pci_realize;
+ dc->reset = sii3112_reset;
dc->desc = "SiI3112A SATA controller";
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
}
--
2.20.1
next prev parent reply other threads:[~2019-09-26 15:30 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 ` [PATCH 03/11] hw/isa/piix4: " Philippe Mathieu-Daudé
2019-09-26 15:17 ` [PATCH 04/11] hw/pci-host/piix: " Philippe Mathieu-Daudé
2019-09-26 15:17 ` Philippe Mathieu-Daudé [this message]
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-6-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=armbru@redhat.com \
--cc=damien.hedde@greensocs.com \
--cc=jsnow@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).