From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: "Corey Minyard" <cminyard@mvista.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
qemu-devel <qemu-devel@nongnu.org>,
"KONRAD Frederic" <frederic.konrad@adacore.com>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Paul Burton" <pburton@wavecomp.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Magnus Damm" <magnus.damm@gmail.com>,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Artyom Tarasenko" <atar4qemu@gmail.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Fabien Chouteau" <chouteau@adacore.com>,
qemu-arm <qemu-arm@nongnu.org>,
"Richard Henderson" <rth@twiddle.net>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Aleksandar Rikalo" <arikalo@wavecomp.com>,
qemu-ppc <qemu-ppc@nongnu.org>,
"Aleksandar Markovic" <amarkovic@wavecomp.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: Re: [PATCH v3 21/33] lance: replace PROP_PTR with PROP_LINK
Date: Thu, 24 Oct 2019 13:09:06 +0200 [thread overview]
Message-ID: <CAMxuvay9kroZUo7ZbdhJqKAdp52rMmLGv0LBvktb68B2CKg+Mw@mail.gmail.com> (raw)
In-Reply-To: <2d027692-e178-c1c8-8384-ad70ed345f29@redhat.com>
Hi
On Thu, Oct 24, 2019 at 1:01 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> On 10/23/19 7:31 PM, Marc-André Lureau wrote:
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> > ---
> > hw/dma/sparc32_dma.c | 2 +-
> > hw/net/lance.c | 5 ++---
> > hw/net/pcnet-pci.c | 2 +-
> > hw/net/pcnet.h | 2 +-
> > 4 files changed, 5 insertions(+), 6 deletions(-)
> >
> > diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c
> > index 0e5bbcdc7f..3e4da0c47f 100644
> > --- a/hw/dma/sparc32_dma.c
> > +++ b/hw/dma/sparc32_dma.c
> > @@ -346,7 +346,7 @@ static void sparc32_ledma_device_realize(DeviceState *dev, Error **errp)
> > d = qdev_create(NULL, TYPE_LANCE);
> > object_property_add_child(OBJECT(dev), "lance", OBJECT(d), errp);
> > qdev_set_nic_properties(d, nd);
> > - qdev_prop_set_ptr(d, "dma", dev);
> > + object_property_set_link(OBJECT(d), OBJECT(dev), "dma", errp);
> > qdev_init_nofail(d);
> > }
> >
> > diff --git a/hw/net/lance.c b/hw/net/lance.c
> > index 6631e2a4e0..4d96299041 100644
> > --- a/hw/net/lance.c
> > +++ b/hw/net/lance.c
> > @@ -138,7 +138,8 @@ static void lance_instance_init(Object *obj)
> > }
> >
> > static Property lance_properties[] = {
> > - DEFINE_PROP_PTR("dma", SysBusPCNetState, state.dma_opaque),
> > + DEFINE_PROP_LINK("dma", SysBusPCNetState, state.dma_opaque,
> > + TYPE_DEVICE, DeviceState *),
> > DEFINE_NIC_PROPERTIES(SysBusPCNetState, state.conf),
> > DEFINE_PROP_END_OF_LIST(),
> > };
> > @@ -153,8 +154,6 @@ static void lance_class_init(ObjectClass *klass, void *data)
> > dc->reset = lance_reset;
> > dc->vmsd = &vmstate_lance;
> > dc->props = lance_properties;
> > - /* Reason: pointer property "dma" */
> > - dc->user_creatable = false;
>
> But we still can not start it with the -device option and set the dma,
> can we?
This is a sysbus device, so you can't. I'll add a commit comment.
In theory, link property allows you to pass a QOM path to reference a
QOM instance from -device.
>
> > }
> >
> > static const TypeInfo lance_info = {
> > diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c
> > index 4723c30c79..d067d21e2c 100644
> > --- a/hw/net/pcnet-pci.c
> > +++ b/hw/net/pcnet-pci.c
> > @@ -231,7 +231,7 @@ static void pci_pcnet_realize(PCIDevice *pci_dev, Error **errp)
> > s->irq = pci_allocate_irq(pci_dev);
> > s->phys_mem_read = pci_physical_memory_read;
> > s->phys_mem_write = pci_physical_memory_write;
> > - s->dma_opaque = pci_dev;
> > + s->dma_opaque = DEVICE(pci_dev);
> >
> > pcnet_common_init(DEVICE(pci_dev), s, &net_pci_pcnet_info);
> > }
> > diff --git a/hw/net/pcnet.h b/hw/net/pcnet.h
> > index 28d19a5c6f..f49b213c57 100644
> > --- a/hw/net/pcnet.h
> > +++ b/hw/net/pcnet.h
> > @@ -50,7 +50,7 @@ struct PCNetState_st {
> > uint8_t *buf, int len, int do_bswap);
> > void (*phys_mem_write)(void *dma_opaque, hwaddr addr,
> > uint8_t *buf, int len, int do_bswap);
> > - void *dma_opaque;
> > + DeviceState *dma_opaque;
> > int tx_busy;
> > int looptest;
> > };
> >
next prev parent reply other threads:[~2019-10-24 11:29 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é
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 [this message]
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=CAMxuvay9kroZUo7ZbdhJqKAdp52rMmLGv0LBvktb68B2CKg+Mw@mail.gmail.com \
--to=marcandre.lureau@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=mark.cave-ayland@ilande.co.uk \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=pburton@wavecomp.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--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).