From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Sagar Karandikar" <sagark@eecs.berkeley.edu>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Max Filippov" <jcmvbkbc@gmail.com>,
"Alistair Francis" <Alistair.Francis@wdc.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Yoshinori Sato" <ysato@users.sourceforge.jp>,
"Magnus Damm" <magnus.damm@gmail.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Alistair Francis" <alistair@alistair23.me>,
qemu-arm@nongnu.org,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Stafford Horne" <shorne@gmail.com>,
"David Gibson" <david@gibson.dropbear.id.au>,
qemu-riscv@nongnu.org, "Thomas Huth" <huth@tuxfamily.org>,
"Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
qemu-ppc@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>
Subject: [RFC PATCH v2 20/23] hw/sh4: Emit warning when old code is used
Date: Sat, 4 Jul 2020 17:39:05 +0200 [thread overview]
Message-ID: <20200704153908.12118-21-philmd@redhat.com> (raw)
In-Reply-To: <20200704153908.12118-1-philmd@redhat.com>
This code hasn't been QOM'ified yet. Warn the user.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/char/sh_serial.c | 3 +++
hw/intc/sh_intc.c | 3 +++
hw/sh4/r2d.c | 3 +++
hw/sh4/sh7750.c | 4 ++++
hw/timer/sh_timer.c | 5 +++++
5 files changed, 18 insertions(+)
diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index 167f4d8cb9..9366a23dd2 100644
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -31,6 +31,7 @@
#include "chardev/char-fe.h"
#include "qapi/error.h"
#include "qemu/timer.h"
+#include "hw/qdev-deprecated.h"
//#define DEBUG_SERIAL
@@ -382,6 +383,8 @@ void sh_serial_init(MemoryRegion *sysmem,
{
sh_serial_state *s;
+ qdev_warn_deprecated_function_used();
+
s = g_malloc0(sizeof(sh_serial_state));
s->feat = feat;
diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c
index 72a55e32dd..c90fbf47bb 100644
--- a/hw/intc/sh_intc.c
+++ b/hw/intc/sh_intc.c
@@ -13,6 +13,7 @@
#include "hw/sh4/sh_intc.h"
#include "hw/irq.h"
#include "hw/sh4/sh.h"
+#include "hw/qdev-deprecated.h"
//#define DEBUG_INTC
//#define DEBUG_INTC_SOURCES
@@ -444,6 +445,8 @@ int sh_intc_init(MemoryRegion *sysmem,
{
unsigned int i, j;
+ qdev_warn_deprecated_function_used();
+
desc->pending = 0;
desc->nr_sources = nr_sources;
desc->mask_regs = mask_regs;
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 443820901d..5b4d383a86 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -43,6 +43,7 @@
#include "hw/usb.h"
#include "hw/block/flash.h"
#include "exec/address-spaces.h"
+#include "hw/qdev-deprecated.h"
#define FLASH_BASE 0x00000000
#define FLASH_SIZE (16 * MiB)
@@ -187,6 +188,8 @@ static qemu_irq *r2d_fpga_init(MemoryRegion *sysmem,
{
r2d_fpga_t *s;
+ qdev_warn_deprecated_function_used();
+
s = g_malloc0(sizeof(r2d_fpga_t));
s->irl = irl;
diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index f8ac3ec6e3..82549139f9 100644
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -33,6 +33,7 @@
#include "hw/timer/tmu012.h"
#include "cpu.h"
#include "exec/exec-all.h"
+#include "hw/qdev-deprecated.h"
#define NB_DEVICES 4
@@ -757,6 +758,8 @@ SH7750State *sh7750_init(SuperHCPU *cpu, MemoryRegion *sysmem)
{
SH7750State *s;
+ qdev_warn_deprecated_function_used();
+
s = g_malloc0(sizeof(SH7750State));
s->cpu = cpu;
s->periph_freq = 60000000; /* 60MHz */
@@ -867,6 +870,7 @@ SH7750State *sh7750_init(SuperHCPU *cpu, MemoryRegion *sysmem)
qemu_irq sh7750_irl(SH7750State *s)
{
+ qdev_warn_deprecated_function_used();
sh_intc_toggle_source(sh_intc_source(&s->intc, IRL), 1, 0); /* enable */
return qemu_allocate_irq(sh_intc_set_irl, sh_intc_source(&s->intc, IRL), 0);
}
diff --git a/hw/timer/sh_timer.c b/hw/timer/sh_timer.c
index bb0e1c8ee5..d0740b2ae6 100644
--- a/hw/timer/sh_timer.c
+++ b/hw/timer/sh_timer.c
@@ -15,6 +15,7 @@
#include "hw/sh4/sh.h"
#include "hw/timer/tmu012.h"
#include "hw/ptimer.h"
+#include "hw/qdev-deprecated.h"
//#define DEBUG_TIMER
@@ -200,6 +201,8 @@ static void *sh_timer_init(uint32_t freq, int feat, qemu_irq irq)
{
sh_timer_state *s;
+ qdev_warn_deprecated_function_used();
+
s = (sh_timer_state *)g_malloc0(sizeof(sh_timer_state));
s->freq = freq;
s->feat = feat;
@@ -320,6 +323,8 @@ void tmu012_init(MemoryRegion *sysmem, hwaddr base,
tmu012_state *s;
int timer_feat = (feat & TMU012_FEAT_EXTCLK) ? TIMER_FEAT_EXTCLK : 0;
+ qdev_warn_deprecated_function_used();
+
s = (tmu012_state *)g_malloc0(sizeof(tmu012_state));
s->feat = feat;
s->timer[0] = sh_timer_init(freq, timer_feat, ch0_irq);
--
2.21.3
next prev parent reply other threads:[~2020-07-04 15:59 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-04 15:38 [RFC PATCH v2 00/23] hw/qdev: Warn when using pre-qdev/QOM devices Philippe Mathieu-Daudé
2020-07-04 15:38 ` [PATCH v2 01/23] qom/object: Update documentation Philippe Mathieu-Daudé
2020-07-04 15:38 ` [RFC PATCH v2 02/23] hw/core/qdev: Add qdev_warn_deprecated_function_used() helper Philippe Mathieu-Daudé
2020-07-04 16:22 ` BALATON Zoltan
2020-07-04 15:38 ` [RFC PATCH v2 03/23] hw/arm/omap: Emit warning when old code is used Philippe Mathieu-Daudé
2020-07-04 15:38 ` [RFC PATCH v2 04/23] hw/arm/pxa2xx: " Philippe Mathieu-Daudé
2020-07-04 15:38 ` [RFC PATCH v2 05/23] hw/arm/nseries: " Philippe Mathieu-Daudé
2020-07-04 15:38 ` [RFC PATCH v2 06/23] hw/char/parallel: " Philippe Mathieu-Daudé
2020-07-04 15:38 ` [RFC PATCH v2 07/23] hw/display/blizzard: " Philippe Mathieu-Daudé
2020-07-04 15:38 ` [RFC PATCH v2 08/23] hw/display/ramfb: " Philippe Mathieu-Daudé
2020-07-06 14:15 ` Gerd Hoffmann
2020-07-06 14:18 ` Philippe Mathieu-Daudé
2020-07-04 15:38 ` [RFC PATCH v2 09/23] hw/display/tc6393xb: " Philippe Mathieu-Daudé
2020-07-04 15:38 ` [RFC PATCH v2 10/23] hw/display/vga-isa-mm: " Philippe Mathieu-Daudé
2020-07-04 15:38 ` [RFC PATCH v2 11/23] hw/dma/etraxfs_dma: " Philippe Mathieu-Daudé
2020-07-04 15:38 ` [RFC PATCH v2 12/23] hw/dma/soc_dma: " Philippe Mathieu-Daudé
2020-07-04 15:38 ` [RFC PATCH v2 13/23] hw/input/lasips2: " Philippe Mathieu-Daudé
2020-07-04 15:38 ` [RFC PATCH v2 14/23] hw/input/tsc2005: " Philippe Mathieu-Daudé
2020-07-04 15:39 ` [RFC PATCH v2 15/23] hw/m68k/mcf520x: " Philippe Mathieu-Daudé
2020-07-05 6:31 ` Thomas Huth
2020-07-04 15:39 ` [RFC PATCH v2 16/23] hw/misc/cbus: " Philippe Mathieu-Daudé
2020-07-04 15:39 ` [RFC PATCH v2 17/23] hw/nvram/eeprom93xx: " Philippe Mathieu-Daudé
2020-07-04 15:39 ` [RFC PATCH v2 18/23] hw/openrisc/cputimer: " Philippe Mathieu-Daudé
2020-07-04 15:47 ` Philippe Mathieu-Daudé
2020-07-04 15:39 ` [RFC PATCH v2 19/23] hw/ppc/ppc4xx: " Philippe Mathieu-Daudé
2020-07-04 15:39 ` Philippe Mathieu-Daudé [this message]
2020-07-04 15:39 ` [RFC PATCH v2 21/23] hw/riscv: " Philippe Mathieu-Daudé
2020-07-06 16:46 ` Alistair Francis
2020-07-04 15:39 ` [RFC PATCH v2 22/23] hw/usb/hcd-musb: " Philippe Mathieu-Daudé
2020-07-04 15:39 ` [RFC PATCH v2 23/23] hw/xtensa/xtfpga: " 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=20200704153908.12118-21-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=Alistair.Francis@wdc.com \
--cc=alistair@alistair23.me \
--cc=berrange@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=edgar.iglesias@gmail.com \
--cc=ehabkost@redhat.com \
--cc=huth@tuxfamily.org \
--cc=jcmvbkbc@gmail.com \
--cc=kbastian@mail.uni-paderborn.de \
--cc=kraxel@redhat.com \
--cc=magnus.damm@gmail.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=palmer@dabbelt.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=sagark@eecs.berkeley.edu \
--cc=shorne@gmail.com \
--cc=ysato@users.sourceforge.jp \
/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).