From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 07/36] hw/input/ps2: Convert TYPE_PS2_DEVICE to 3-phase reset
Date: Fri, 16 Dec 2022 21:42:15 +0000 [thread overview]
Message-ID: <20221216214244.1391647-8-peter.maydell@linaro.org> (raw)
In-Reply-To: <20221216214244.1391647-1-peter.maydell@linaro.org>
Convert the parent class TYPE_PS2_DEVICE to 3-phase reset. Note that
we need an 'exit' phase function as well as the usual 'hold' phase
function, because changing outbound IRQ line state is only permitted
in 'exit'. (Strictly speaking it's not supposed to be done in a
legacy reset handler either, but you can often get away with it.)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20221109170009.3498451-2-peter.maydell@linaro.org
---
hw/input/ps2.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 05cf7111e31..47a5d68e300 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -1001,12 +1001,18 @@ void ps2_write_mouse(PS2MouseState *s, int val)
}
}
-static void ps2_reset(DeviceState *dev)
+static void ps2_reset_hold(Object *obj)
{
- PS2State *s = PS2_DEVICE(dev);
+ PS2State *s = PS2_DEVICE(obj);
s->write_cmd = -1;
ps2_reset_queue(s);
+}
+
+static void ps2_reset_exit(Object *obj)
+{
+ PS2State *s = PS2_DEVICE(obj);
+
ps2_lower_irq(s);
}
@@ -1281,8 +1287,10 @@ static void ps2_init(Object *obj)
static void ps2_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
+ ResettableClass *rc = RESETTABLE_CLASS(klass);
- dc->reset = ps2_reset;
+ rc->phases.hold = ps2_reset_hold;
+ rc->phases.exit = ps2_reset_exit;
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
}
--
2.25.1
next prev parent reply other threads:[~2022-12-16 22:14 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-16 21:42 [PULL 00/36] reset refactoring patches Peter Maydell
2022-12-16 21:42 ` [PULL 01/36] hw/s390x/s390-pci-inst.c: Use device_cold_reset() to reset PCI devices Peter Maydell
2022-12-16 21:42 ` [PULL 02/36] pci: Use device_cold_reset() and bus_cold_reset() Peter Maydell
2022-12-16 21:42 ` [PULL 03/36] hw/hyperv/vmbus: " Peter Maydell
2022-12-16 21:42 ` [PULL 04/36] Replace use of qdev_reset_all() with device_cold_reset() Peter Maydell
2022-12-16 21:42 ` [PULL 05/36] qdev: Remove qdev_reset_all() and qbus_reset_all() Peter Maydell
2022-12-16 21:42 ` [PULL 06/36] hw: Remove device_legacy_reset() Peter Maydell
2022-12-16 21:42 ` Peter Maydell [this message]
2022-12-16 21:42 ` [PULL 08/36] hw/input/ps2.c: Convert TYPE_PS2_{KBD, MOUSE}_DEVICE to 3-phase reset Peter Maydell
2022-12-16 21:42 ` [PULL 09/36] hw/misc/mos6522: Convert TYPE_MOS6522 " Peter Maydell
2022-12-16 21:42 ` [PULL 10/36] hw/misc: Convert TYPE_MOS6522 subclasses " Peter Maydell
2022-12-16 21:42 ` [PULL 11/36] hw/core/cpu-common: Convert TYPE_CPU class " Peter Maydell
2022-12-16 21:42 ` [PULL 12/36] target/arm: Convert " Peter Maydell
2022-12-16 21:42 ` [PULL 13/36] target/avr: " Peter Maydell
2022-12-16 21:42 ` [PULL 14/36] target/cris: " Peter Maydell
2022-12-16 21:42 ` [PULL 15/36] target/hexagon: " Peter Maydell
2022-12-16 21:42 ` [PULL 16/36] target/i386: " Peter Maydell
2022-12-16 21:42 ` [PULL 17/36] target/loongarch: " Peter Maydell
2022-12-16 21:42 ` [PULL 18/36] target/m68k: " Peter Maydell
2022-12-16 21:42 ` [PULL 19/36] target/microblaze: " Peter Maydell
2022-12-16 21:42 ` [PULL 20/36] target/mips: " Peter Maydell
2022-12-16 21:42 ` [PULL 21/36] target/nios2: " Peter Maydell
2022-12-16 21:42 ` [PULL 22/36] target/openrisc: " Peter Maydell
2022-12-16 21:42 ` [PULL 23/36] target/ppc: " Peter Maydell
2022-12-16 21:42 ` [PULL 24/36] target/riscv: " Peter Maydell
2022-12-16 21:42 ` [PULL 25/36] target/rx: " Peter Maydell
2022-12-16 21:42 ` [PULL 26/36] target/sh4: " Peter Maydell
2022-12-16 21:42 ` [PULL 27/36] target/sparc: " Peter Maydell
2022-12-16 21:42 ` [PULL 28/36] target/tricore: " Peter Maydell
2022-12-16 21:42 ` [PULL 29/36] target/xtensa: " Peter Maydell
2022-12-16 21:42 ` [PULL 30/36] hw/virtio: Convert TYPE_VIRTIO_PCI " Peter Maydell
2022-12-16 21:42 ` [PULL 31/36] hw/display/virtio-vga: Convert TYPE_VIRTIO_VGA_BASE " Peter Maydell
2022-12-16 21:42 ` [PULL 32/36] pci: Convert TYPE_PCIE_ROOT_PORT " Peter Maydell
2022-12-16 21:42 ` [PULL 33/36] pci: Convert child classes of " Peter Maydell
2022-12-16 21:42 ` [PULL 34/36] hw/intc/xics: Reset TYPE_ICS objects with device_cold_reset() Peter Maydell
2022-12-16 21:42 ` [PULL 35/36] hw/intc/xics: Convert TYPE_ICS to 3-phase reset Peter Maydell
2022-12-16 21:42 ` [PULL 36/36] hw/pci-host/pnv_phb3_msi: Convert TYPE_PHB3_MSI " Peter Maydell
2022-12-17 21:18 ` [PULL 00/36] reset refactoring patches 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=20221216214244.1391647-8-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=qemu-devel@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).