From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Marc-André Lureau" <marcandre.lureau@redhat.com>, qemu-devel@nongnu.org
Cc: "Corey Minyard" <cminyard@mvista.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Magnus Damm" <magnus.damm@gmail.com>,
"Jason Wang" <jasowang@redhat.com>,
qemu-ppc@nongnu.org,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Fabien Chouteau" <chouteau@adacore.com>,
"Aleksandar Rikalo" <arikalo@wavecomp.com>,
"KONRAD Frederic" <frederic.konrad@adacore.com>,
qemu-arm@nongnu.org, "Hervé Poussineau" <hpoussin@reactos.org>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Aleksandar Markovic" <amarkovic@wavecomp.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Paul Burton" <pburton@wavecomp.com>,
"Artyom Tarasenko" <atar4qemu@gmail.com>,
"Richard Henderson" <rth@twiddle.net>
Subject: Re: [PATCH v3 20/33] vmmouse: replace PROP_PTR with PROP_LINK
Date: Thu, 24 Oct 2019 00:59:07 +0200 [thread overview]
Message-ID: <8c5eefc2-6b6b-594d-bf55-02fc332c6ba7@redhat.com> (raw)
In-Reply-To: <20191023173154.30051-21-marcandre.lureau@redhat.com>
On 10/23/19 7:31 PM, Marc-André Lureau wrote:
> While at it, use the expected type.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> hw/i386/pc.c | 6 +++---
> hw/i386/vmmouse.c | 8 +++-----
> hw/input/pckbd.c | 8 +++-----
> include/hw/input/i8042.h | 4 +++-
> 4 files changed, 12 insertions(+), 14 deletions(-)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 00ee16ccab..021ec8c593 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1861,9 +1861,9 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl, bool no_vmport)
> vmmouse = NULL;
> }
> if (vmmouse) {
> - DeviceState *dev = DEVICE(vmmouse);
> - qdev_prop_set_ptr(dev, "ps2_mouse", i8042);
> - qdev_init_nofail(dev);
> + object_property_set_link(OBJECT(vmmouse), OBJECT(i8042),
> + "i8042", &error_abort);
> + qdev_init_nofail(DEVICE(vmmouse));
> }
> port92 = isa_create_simple(isa_bus, "port92");
>
> diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
> index 41ad91ad53..c0c329f817 100644
> --- a/hw/i386/vmmouse.c
> +++ b/hw/i386/vmmouse.c
> @@ -66,7 +66,7 @@ typedef struct VMMouseState
> uint16_t status;
> uint8_t absolute;
> QEMUPutMouseEntry *entry;
> - void *ps2_mouse;
> + ISAKBDState *i8042;
> } VMMouseState;
>
> static uint32_t vmmouse_get_status(VMMouseState *s)
> @@ -105,7 +105,7 @@ static void vmmouse_mouse_event(void *opaque, int x, int y, int dz, int buttons_
>
> /* need to still generate PS2 events to notify driver to
> read from queue */
> - i8042_isa_mouse_fake_event(s->ps2_mouse);
> + i8042_isa_mouse_fake_event(s->i8042);
> }
>
> static void vmmouse_remove_handler(VMMouseState *s)
> @@ -275,7 +275,7 @@ static void vmmouse_realizefn(DeviceState *dev, Error **errp)
> }
>
> static Property vmmouse_properties[] = {
> - DEFINE_PROP_PTR("ps2_mouse", VMMouseState, ps2_mouse),
> + DEFINE_PROP_LINK("i8042", VMMouseState, i8042, TYPE_I8042, ISAKBDState *),
> DEFINE_PROP_END_OF_LIST(),
> };
>
> @@ -287,8 +287,6 @@ static void vmmouse_class_initfn(ObjectClass *klass, void *data)
> dc->reset = vmmouse_reset;
> dc->vmsd = &vmstate_vmmouse;
> dc->props = vmmouse_properties;
> - /* Reason: pointer property "ps2_mouse" */
> - dc->user_creatable = false;
> }
>
> static const TypeInfo vmmouse_info = {
> diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
> index f0acfd86f7..9b641021c9 100644
> --- a/hw/input/pckbd.c
> +++ b/hw/input/pckbd.c
> @@ -483,17 +483,15 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
>
> #define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042)
>
> -typedef struct ISAKBDState {
> +struct ISAKBDState {
> ISADevice parent_obj;
>
> KBDState kbd;
> MemoryRegion io[2];
> -} ISAKBDState;
> +};
>
> -void i8042_isa_mouse_fake_event(void *opaque)
> +void i8042_isa_mouse_fake_event(ISAKBDState *isa)
> {
> - ISADevice *dev = opaque;
> - ISAKBDState *isa = I8042(dev);
> KBDState *s = &isa->kbd;
>
> ps2_mouse_fake_event(s->mouse);
> diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h
> index 246e6f3335..8eaebf50ce 100644
> --- a/include/hw/input/i8042.h
> +++ b/include/hw/input/i8042.h
> @@ -14,10 +14,12 @@
>
> #define I8042_A20_LINE "a20"
>
> +typedef struct ISAKBDState ISAKBDState;
> +
> void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
> MemoryRegion *region, ram_addr_t size,
> hwaddr mask);
> -void i8042_isa_mouse_fake_event(void *opaque);
> +void i8042_isa_mouse_fake_event(ISAKBDState *isa);
> void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out);
>
> #endif /* HW_INPUT_I8042_H */
>
Nice!
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
next prev parent reply other threads:[~2019-10-23 23:00 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 17:31 [PATCH v3 00/33] Clean-ups: qom-ify serial and remove QDEV_PROP_PTR Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 01/33] qdev: remove unused qdev_prop_int64 Marc-André Lureau
2019-11-18 14:01 ` Peter Maydell
2019-11-20 3:36 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 02/33] sysbus: remove unused sysbus_try_create* Marc-André Lureau
2019-10-23 22:35 ` Philippe Mathieu-Daudé
2019-11-18 14:02 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 03/33] sysbus: remove outdated comment Marc-André Lureau
2019-10-23 22:36 ` Philippe Mathieu-Daudé
2019-10-23 17:31 ` [PATCH v3 04/33] chardev: generate an internal id when none given Marc-André Lureau
2019-11-18 14:12 ` Peter Maydell
2019-11-18 18:54 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 05/33] serial-pci-multi: factor out multi_serial_get_nr_ports Marc-André Lureau
2019-10-23 22:41 ` Philippe Mathieu-Daudé
2019-10-24 9:59 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 06/33] serial: initial qom-ification Marc-André Lureau
2019-10-24 8:48 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 07/33] serial: register vmsd with DeviceClass Marc-André Lureau
2019-11-18 14:21 ` Peter Maydell
2019-11-19 10:22 ` Marc-André Lureau
2019-11-19 10:33 ` Peter Maydell
2019-11-19 11:57 ` Marc-André Lureau
2019-11-20 18:54 ` Dr. David Alan Gilbert
2019-11-21 6:49 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 08/33] serial: add "chardev" property Marc-André Lureau
2019-10-23 22:39 ` Philippe Mathieu-Daudé
2019-11-18 14:23 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 09/33] serial: add "baudbase" property Marc-André Lureau
2019-10-23 22:40 ` Philippe Mathieu-Daudé
2019-11-18 14:26 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 10/33] serial: add "instance-id" property Marc-André Lureau
2019-11-18 14:29 ` Peter Maydell
2019-11-19 10:32 ` Marc-André Lureau
2019-11-20 9:06 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 11/33] serial: realize the serial device Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 12/33] serial: replace serial_exit_core() with unrealize Marc-André Lureau
2019-11-18 14:32 ` Peter Maydell
2019-11-20 12:32 ` Philippe Mathieu-Daudé
2019-10-23 17:31 ` [PATCH v3 13/33] serial: start making SerialMM a sysbus device Marc-André Lureau
2019-11-18 14:43 ` Peter Maydell
2019-11-20 7:34 ` Marc-André Lureau
2019-11-20 10:36 ` Peter Maydell
2019-11-20 10:40 ` Marc-André Lureau
2019-11-20 10:58 ` Peter Maydell
2019-11-20 11:03 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 14/33] serial-mm: add "regshift" property Marc-André Lureau
2019-11-18 14:54 ` Peter Maydell
2019-11-20 7:53 ` Marc-André Lureau
2019-11-20 10:43 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 15/33] serial-mm: add endianness property Marc-André Lureau
2019-11-18 15:02 ` Peter Maydell
2019-11-18 15:07 ` Peter Maydell
2019-11-20 7:59 ` Marc-André Lureau
2019-11-20 12:57 ` Philippe Mathieu-Daudé
2019-10-23 17:31 ` [PATCH v3 16/33] serial-mm: use sysbus facilities Marc-André Lureau
2019-11-18 15:09 ` Peter Maydell
2019-11-20 8:30 ` Marc-André Lureau
2019-11-20 10:46 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 17/33] serial: make SerialIO a sysbus device Marc-André Lureau
2019-11-18 15:16 ` Peter Maydell
2019-11-20 8:41 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 18/33] mips: inline serial_init Marc-André Lureau
2019-11-18 15:24 ` Peter Maydell
2019-11-20 11:14 ` Marc-André Lureau
2019-11-20 0:07 ` Aleksandar Markovic
2019-10-23 17:31 ` [PATCH v3 19/33] sm501: make SerialMM a child, export chardev property Marc-André Lureau
2019-10-23 22:57 ` Philippe Mathieu-Daudé
2019-10-24 10:28 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 20/33] vmmouse: replace PROP_PTR with PROP_LINK Marc-André Lureau
2019-10-23 22:59 ` Philippe Mathieu-Daudé [this message]
2019-10-23 17:31 ` [PATCH v3 21/33] lance: " Marc-André Lureau
2019-10-23 23:00 ` Philippe Mathieu-Daudé
2019-10-24 11:09 ` Marc-André Lureau
2019-10-24 11:47 ` Philippe Mathieu-Daudé
2019-10-24 11:52 ` Peter Maydell
2019-10-24 18:07 ` Eduardo Habkost
2019-10-25 7:31 ` Peter Maydell
2019-10-24 12:25 ` Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 22/33] etraxfs: remove PROP_PTR usage Marc-André Lureau
2019-11-18 15:28 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 23/33] dp8393x: replace PROP_PTR with PROP_LINK Marc-André Lureau
2019-10-23 23:02 ` Philippe Mathieu-Daudé
2019-10-24 11:12 ` Marc-André Lureau
2019-10-24 11:48 ` Philippe Mathieu-Daudé
2019-10-23 17:31 ` [PATCH v3 24/33] leon3: use qemu_irq framework instead of callback as property Marc-André Lureau
2019-11-18 14:15 ` KONRAD Frederic
2019-11-18 15:34 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 25/33] sparc: move PIL irq handling to cpu.c Marc-André Lureau
2019-11-18 15:38 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 26/33] RFC: mips/cps: fix setting saar property Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 27/33] cris: improve passing PIC interrupt vector to the CPU Marc-André Lureau
2019-11-18 15:40 ` Peter Maydell
2019-10-23 17:31 ` [PATCH v3 28/33] smbus-eeprom: remove PROP_PTR Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 29/33] omap-intc: " Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 30/33] omap-i2c: " Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 31/33] omap-gpio: " Marc-André Lureau
2019-10-23 17:31 ` [PATCH v3 32/33] qdev: remove PROP_MEMORY_REGION Marc-André Lureau
2019-10-23 23:07 ` Philippe Mathieu-Daudé
2019-10-23 17:31 ` [PATCH v3 33/33] qdev: remove QDEV_PROP_PTR Marc-André Lureau
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=8c5eefc2-6b6b-594d-bf55-02fc332c6ba7@redhat.com \
--to=philmd@redhat.com \
--cc=amarkovic@wavecomp.com \
--cc=arikalo@wavecomp.com \
--cc=atar4qemu@gmail.com \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=chouteau@adacore.com \
--cc=cminyard@mvista.com \
--cc=edgar.iglesias@gmail.com \
--cc=ehabkost@redhat.com \
--cc=frederic.konrad@adacore.com \
--cc=hpoussin@reactos.org \
--cc=jasowang@redhat.com \
--cc=magnus.damm@gmail.com \
--cc=marcandre.lureau@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=pburton@wavecomp.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=rth@twiddle.net \
/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).