From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, "Jason Wang" <jasowang@redhat.com>,
"Laurent Vivier" <laurent@vivier.eu>,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Aleksandar Markovic" <amarkovic@wavecomp.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Aleksandar Rikalo" <aleksandar.rikalo@rt-rk.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PATCH v4 25/37] dp8393x: replace PROP_PTR with PROP_LINK
Date: Wed, 20 Nov 2019 19:24:30 +0400 [thread overview]
Message-ID: <20191120152442.26657-26-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20191120152442.26657-1-marcandre.lureau@redhat.com>
Link property is the correct way to pass a MemoryRegion to a device
for DMA purposes.
Sidenote: as a sysbus device, this remains non-usercreatable
even though we can drop the specific flag here.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/m68k/q800.c | 3 ++-
hw/mips/mips_jazz.c | 3 ++-
hw/net/dp8393x.c | 7 +++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 4ca8678007..8f3eb6bfe7 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -239,7 +239,8 @@ static void q800_init(MachineState *machine)
qdev_set_nic_properties(dev, &nd_table[0]);
qdev_prop_set_uint8(dev, "it_shift", 2);
qdev_prop_set_bit(dev, "big_endian", true);
- qdev_prop_set_ptr(dev, "dma_mr", get_system_memory());
+ object_property_set_link(OBJECT(dev), OBJECT(get_system_memory()),
+ "dma_mr", &error_abort);
qdev_init_nofail(dev);
sysbus = SYS_BUS_DEVICE(dev);
sysbus_mmio_map(sysbus, 0, SONIC_BASE);
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index d978bb64a0..1518eb5e55 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -284,7 +284,8 @@ static void mips_jazz_init(MachineState *machine,
dev = qdev_create(NULL, "dp8393x");
qdev_set_nic_properties(dev, nd);
qdev_prop_set_uint8(dev, "it_shift", 2);
- qdev_prop_set_ptr(dev, "dma_mr", rc4030_dma_mr);
+ object_property_set_link(OBJECT(dev), OBJECT(rc4030_dma_mr),
+ "dma_mr", &error_abort);
qdev_init_nofail(dev);
sysbus = SYS_BUS_DEVICE(dev);
sysbus_mmio_map(sysbus, 0, 0x80001000);
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index 3d991af163..cdc2631c0c 100644
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -175,7 +175,7 @@ typedef struct dp8393xState {
int loopback_packet;
/* Memory access */
- void *dma_mr;
+ MemoryRegion *dma_mr;
AddressSpace as;
} dp8393xState;
@@ -948,7 +948,8 @@ static const VMStateDescription vmstate_dp8393x = {
static Property dp8393x_properties[] = {
DEFINE_NIC_PROPERTIES(dp8393xState, conf),
- DEFINE_PROP_PTR("dma_mr", dp8393xState, dma_mr),
+ DEFINE_PROP_LINK("dma_mr", dp8393xState, dma_mr,
+ TYPE_MEMORY_REGION, MemoryRegion *),
DEFINE_PROP_UINT8("it_shift", dp8393xState, it_shift, 0),
DEFINE_PROP_BOOL("big_endian", dp8393xState, big_endian, false),
DEFINE_PROP_END_OF_LIST(),
@@ -963,8 +964,6 @@ static void dp8393x_class_init(ObjectClass *klass, void *data)
dc->reset = dp8393x_reset;
dc->vmsd = &vmstate_dp8393x;
dc->props = dp8393x_properties;
- /* Reason: dma_mr property can't be set */
- dc->user_creatable = false;
}
static const TypeInfo dp8393x_info = {
--
2.24.0
next prev parent reply other threads:[~2019-11-20 15:49 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-20 15:24 [PATCH v4 00/37] Clean-ups: qom-ify serial and remove QDEV_PROP_PTR Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 01/37] qdev: remove unused qdev_prop_int64 Marc-André Lureau
2019-12-02 5:22 ` Markus Armbruster
2019-12-02 10:29 ` Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 02/37] sysbus: remove unused sysbus_try_create* Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 03/37] sysbus: remove outdated comment Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 04/37] chardev: generate an internal id when none given Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 05/37] serial-pci-multi: factor out multi_serial_get_port_count() Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 06/37] serial: initial qom-ification Marc-André Lureau
2019-11-20 16:40 ` Philippe Mathieu-Daudé
2019-11-20 16:45 ` Marc-André Lureau
2019-11-21 13:39 ` Peter Maydell
2019-11-20 15:24 ` [PATCH v4 07/37] serial: register vmsd with DeviceClass Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 08/37] serial: add "chardev" property Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 09/37] serial: add "baudbase" property Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 10/37] serial: realize the serial device Marc-André Lureau
2019-11-20 16:12 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 11/37] serial: replace serial_exit_core() with unrealize Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 12/37] serial: start making SerialMM a sysbus device Marc-André Lureau
2019-11-21 13:47 ` Peter Maydell
2019-11-21 18:15 ` Marc-André Lureau
2019-11-21 18:24 ` Peter Maydell
2019-11-21 18:51 ` Marc-André Lureau
2019-11-22 10:10 ` Peter Maydell
2019-11-22 12:02 ` Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 13/37] serial-mm: add "regshift" property Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 14/37] serial-mm: add endianness property Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 15/37] serial-mm: use sysbus facilities Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 16/37] serial: make SerialIO a sysbus device Marc-André Lureau
2019-11-20 16:18 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 17/37] mips: inline serial_init() Marc-André Lureau
2019-11-20 16:17 ` Philippe Mathieu-Daudé
2019-11-25 10:12 ` Aleksandar Markovic
2019-11-25 10:15 ` Marc-André Lureau
2019-11-25 13:33 ` Aleksandar Markovic
2019-11-25 19:13 ` Marc-André Lureau
2019-11-27 12:22 ` Aleksandar Markovic
2019-11-20 15:24 ` [PATCH v4 18/37] mips: baudbase is 115200 by default Marc-André Lureau
2019-11-21 13:39 ` Peter Maydell
2019-11-25 10:07 ` Aleksandar Markovic
2019-11-25 10:12 ` Marc-André Lureau
2019-11-25 11:26 ` Philippe Mathieu-Daudé
2019-11-25 12:22 ` Aleksandar Markovic
2019-11-25 12:54 ` Philippe Mathieu-Daudé
2019-11-25 13:03 ` Philippe Mathieu-Daudé
2019-11-27 12:07 ` Marc-André Lureau
2019-11-27 12:20 ` Aleksandar Markovic
2019-11-20 15:24 ` [PATCH v4 19/37] mips: use sysbus_add_io() Marc-André Lureau
2019-11-21 13:40 ` Peter Maydell
2019-11-27 12:28 ` Aleksandar Markovic
2019-12-15 5:40 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 20/37] mips: use sysbus_mmio_get_region() instead of internal fields Marc-André Lureau
2019-11-21 13:48 ` Peter Maydell
2019-11-27 12:23 ` Aleksandar Markovic
2019-12-15 5:39 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 21/37] sm501: make SerialMM a child, export chardev property Marc-André Lureau
2019-11-21 14:00 ` Peter Maydell
2019-11-25 19:47 ` Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 22/37] vmmouse: replace PROP_PTR with PROP_LINK Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 23/37] lance: " Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 24/37] etraxfs: remove PROP_PTR usage Marc-André Lureau
2019-11-20 15:24 ` Marc-André Lureau [this message]
2019-11-20 22:58 ` [PATCH v4 25/37] dp8393x: replace PROP_PTR with PROP_LINK Laurent Vivier
2019-11-20 15:24 ` [PATCH v4 26/37] leon3: use qemu_irq framework instead of callback as property Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 27/37] leon3: use qdev gpio facilities for the PIL Marc-André Lureau
2019-11-21 13:51 ` Peter Maydell
2019-12-15 6:10 ` Philippe Mathieu-Daudé
2019-12-19 12:44 ` Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 28/37] qdev: use g_strcmp0() instead of open-coding it Marc-André Lureau
2019-11-20 16:25 ` Philippe Mathieu-Daudé
2019-11-20 17:10 ` Eduardo Habkost
2019-11-20 15:24 ` [PATCH v4 29/37] RFC: mips/cps: fix setting saar property Marc-André Lureau
2019-12-15 5:56 ` Philippe Mathieu-Daudé
2019-12-16 19:36 ` [EXTERNAL]Re: " Aleksandar Markovic
2019-12-19 13:04 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 30/37] cris: improve passing PIC interrupt vector to the CPU Marc-André Lureau
2019-11-20 16:32 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 31/37] smbus-eeprom: remove PROP_PTR Marc-André Lureau
2019-11-21 22:43 ` Corey Minyard
2019-11-29 9:06 ` Marc-André Lureau
2019-11-29 14:39 ` Corey Minyard
2019-11-22 11:07 ` Philippe Mathieu-Daudé
2019-11-22 11:12 ` Marc-André Lureau
2019-11-22 11:15 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 32/37] omap-intc: " Marc-André Lureau
2019-12-15 5:42 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 33/37] omap-i2c: " Marc-André Lureau
2019-12-15 5:43 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 34/37] omap-gpio: " Marc-André Lureau
2019-12-15 5:44 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 35/37] qdev: remove PROP_MEMORY_REGION Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 36/37] qdev: remove QDEV_PROP_PTR Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 37/37] qdev/qom: remove some TODO limitations now that PROP_PTR is gone Marc-André Lureau
2019-12-01 10:19 ` [PATCH v4 00/37] Clean-ups: qom-ify serial and remove QDEV_PROP_PTR Marc-André Lureau
2019-12-01 12:15 ` [PATCH v6 " Aleksandar Markovic
2019-12-01 15:35 ` Marc-André Lureau
2019-12-01 19:05 ` Aleksandar Markovic
2019-12-01 19:28 ` Aleksandar Markovic
2019-12-01 17:18 ` [PATCH v4 " Peter Maydell
2019-12-01 17:27 ` Marc-André Lureau
2019-12-01 18:10 ` Peter Maydell
2019-12-02 11:17 ` Marc-André Lureau
2019-12-12 20:17 ` Dr. David Alan Gilbert
2019-12-13 16:34 ` Marc-André Lureau
2019-12-11 12:01 ` Marc-André Lureau
2019-12-15 6:11 ` Philippe Mathieu-Daudé
2019-12-19 13:53 ` 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=20191120152442.26657-26-marcandre.lureau@redhat.com \
--to=marcandre.lureau@redhat.com \
--cc=aleksandar.rikalo@rt-rk.com \
--cc=amarkovic@wavecomp.com \
--cc=aurelien@aurel32.net \
--cc=hpoussin@reactos.org \
--cc=jasowang@redhat.com \
--cc=laurent@vivier.eu \
--cc=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).