From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Eduardo Habkost <ehabkost@redhat.com>, qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
qemu-block@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>,
"Aleksandar Rikalo" <arikalo@wavecomp.com>,
"John Snow" <jsnow@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
qemu-arm@nongnu.org, qemu-ppc@nongnu.org,
"Aleksandar Markovic" <amarkovic@wavecomp.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PATCH v2 5/8] hw/ide/via82c: Convert reset handler to DeviceReset
Date: Tue, 8 Oct 2019 16:25:36 +0200 [thread overview]
Message-ID: <20191008142539.7793-6-philmd@redhat.com> (raw)
In-Reply-To: <20191008142539.7793-1-philmd@redhat.com>
The VIA82C686B IDE controller is a PCI device, it will be reset
when the PCI bus it stands on is reset.
Convert its reset handler into a proper Device reset method.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/ide/via.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/ide/via.c b/hw/ide/via.c
index 7087dc676e..053622bd82 100644
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -29,7 +29,6 @@
#include "migration/vmstate.h"
#include "qemu/module.h"
#include "sysemu/dma.h"
-#include "sysemu/reset.h"
#include "hw/ide/pci.h"
#include "trace.h"
@@ -120,10 +119,10 @@ static void via_ide_set_irq(void *opaque, int n, int level)
}
}
-static void via_ide_reset(void *opaque)
+static void via_ide_reset(DeviceState *dev)
{
- PCIIDEState *d = opaque;
- PCIDevice *pd = PCI_DEVICE(d);
+ PCIIDEState *d = PCI_IDE(dev);
+ PCIDevice *pd = PCI_DEVICE(dev);
uint8_t *pci_conf = pd->config;
int i;
@@ -172,8 +171,6 @@ static void via_ide_realize(PCIDevice *dev, Error **errp)
pci_set_long(pci_conf + PCI_CAPABILITY_LIST, 0x000000c0);
dev->wmask[PCI_INTERRUPT_LINE] = 0xf;
- qemu_register_reset(via_ide_reset, d);
-
memory_region_init_io(&d->data_bar[0], OBJECT(d), &pci_ide_data_le_ops,
&d->bus[0], "via-ide0-data", 8);
pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &d->data_bar[0]);
@@ -229,6 +226,7 @@ static void via_ide_class_init(ObjectClass *klass, void *data)
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
+ dc->reset = via_ide_reset;
k->realize = via_ide_realize;
k->exit = via_ide_exitfn;
k->vendor_id = PCI_VENDOR_ID_VIA;
--
2.21.0
next prev parent reply other threads:[~2019-10-08 14:36 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-08 14:25 [PATCH v2 0/8] hw: Convert various reset() handler to DeviceReset Philippe Mathieu-Daudé
2019-10-08 14:25 ` [PATCH v2 1/8] hw/acpi/piix4: Convert reset " Philippe Mathieu-Daudé
2019-10-09 0:58 ` Li Qiang
2019-10-09 19:17 ` Michael S. Tsirkin
2019-10-08 14:25 ` [PATCH v2 2/8] hw/isa/piix4: " Philippe Mathieu-Daudé
2019-10-09 1:02 ` Li Qiang
2019-10-08 14:25 ` [PATCH v2 3/8] hw/ide/piix: " Philippe Mathieu-Daudé
2019-10-09 1:08 ` Li Qiang
2019-10-09 19:50 ` Philippe Mathieu-Daudé
2019-10-08 14:25 ` [PATCH v2 4/8] hw/ide/sii3112: " Philippe Mathieu-Daudé
2019-10-10 1:08 ` Li Qiang
2019-10-08 14:25 ` Philippe Mathieu-Daudé [this message]
2019-10-10 1:10 ` [PATCH v2 5/8] hw/ide/via82c: " Li Qiang
2019-10-08 14:25 ` [PATCH v2 6/8] hw/isa/vt82c686: " Philippe Mathieu-Daudé
2019-10-10 1:12 ` Li Qiang
2019-10-08 14:25 ` [PATCH v2 7/8] hw/input/lm832x: " Philippe Mathieu-Daudé
2019-10-10 1:14 ` Li Qiang
2019-10-08 14:34 ` [PATCH v2 8/8] hw/misc/vmcoreinfo: Add comment about reset handler Philippe Mathieu-Daudé
2019-10-08 15:23 ` Marc-André Lureau
2019-10-10 1:18 ` Li Qiang
2019-10-09 2:28 ` [PATCH v2 0/8] hw: Convert various reset() handler to DeviceReset Li Qiang
2019-10-09 19:54 ` Philippe Mathieu-Daudé
2019-10-10 1:05 ` Li Qiang
2019-10-10 13:08 ` Philippe Mathieu-Daudé
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=20191008142539.7793-6-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=amarkovic@wavecomp.com \
--cc=arikalo@wavecomp.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=jsnow@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@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).