| Message ID | 20200608160044.15531-23-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/qdev: Warn when using pre-qdev/QOM devices | expand |
Am Mon, 8 Jun 2020 18:00:31 +0200 schrieb Philippe Mathieu-Daudé <philmd@redhat.com>: > This code hasn't been QOM'ified yet. Warn the user. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/m68k/mcf5206.c | 5 +++++ > hw/m68k/mcf5208.c | 3 +++ > 2 files changed, 8 insertions(+) > > diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c > index a2fef04f8e..ec0d176674 100644 > --- a/hw/m68k/mcf5206.c > +++ b/hw/m68k/mcf5206.c > @@ -16,6 +16,7 @@ > #include "qemu/timer.h" > #include "hw/ptimer.h" > #include "sysemu/sysemu.h" > +#include "hw/qdev-deprecated.h" > > /* General purpose timer module. */ > typedef struct { > @@ -144,6 +145,8 @@ static m5206_timer_state > *m5206_timer_init(qemu_irq irq) { > m5206_timer_state *s; > > + qdev_warn_deprecated_function_used(); > + > s = g_new0(m5206_timer_state, 1); > s->timer = ptimer_init(m5206_timer_trigger, s, > PTIMER_POLICY_DEFAULT); s->irq = irq; > @@ -566,6 +569,8 @@ qemu_irq *mcf5206_init(MemoryRegion *sysmem, > uint32_t base, M68kCPU *cpu) m5206_mbar_state *s; > qemu_irq *pic; > > + qdev_warn_deprecated_function_used(); > + > s = g_new0(m5206_mbar_state, 1); Ok, it's quite obvious what you refer to here... > memory_region_init_io(&s->iomem, NULL, &m5206_mbar_ops, s, > diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c > index 2ab9701ad6..72627f6833 100644 > --- a/hw/m68k/mcf5208.c > +++ b/hw/m68k/mcf5208.c > @@ -26,6 +26,7 @@ > #include "hw/sysbus.h" > #include "elf.h" > #include "exec/address-spaces.h" > +#include "hw/qdev-deprecated.h" > > #define SYS_FREQ 166666666 > > @@ -191,6 +192,8 @@ static void mcf5208_sys_init(MemoryRegion > *address_space, qemu_irq *pic) m5208_timer_state *s; > int i; > > + qdev_warn_deprecated_function_used(); > + > /* SDRAMC. */ > memory_region_init_io(iomem, NULL, &m5208_sys_ops, NULL, > "m5208-sys", 0x00004000); memory_region_add_subregion(address_space, > 0xfc0a8000, iomem); ... but it is not so obvious what you refer to here. I think that new function should maybe have a "char *what" parameter that contains the name of the struct you refer to. Or at least add a comment in front of the function with a short description? Thomas
diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c index a2fef04f8e..ec0d176674 100644 --- a/hw/m68k/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -16,6 +16,7 @@ #include "qemu/timer.h" #include "hw/ptimer.h" #include "sysemu/sysemu.h" +#include "hw/qdev-deprecated.h" /* General purpose timer module. */ typedef struct { @@ -144,6 +145,8 @@ static m5206_timer_state *m5206_timer_init(qemu_irq irq) { m5206_timer_state *s; + qdev_warn_deprecated_function_used(); + s = g_new0(m5206_timer_state, 1); s->timer = ptimer_init(m5206_timer_trigger, s, PTIMER_POLICY_DEFAULT); s->irq = irq; @@ -566,6 +569,8 @@ qemu_irq *mcf5206_init(MemoryRegion *sysmem, uint32_t base, M68kCPU *cpu) m5206_mbar_state *s; qemu_irq *pic; + qdev_warn_deprecated_function_used(); + s = g_new0(m5206_mbar_state, 1); memory_region_init_io(&s->iomem, NULL, &m5206_mbar_ops, s, diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index 2ab9701ad6..72627f6833 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "elf.h" #include "exec/address-spaces.h" +#include "hw/qdev-deprecated.h" #define SYS_FREQ 166666666 @@ -191,6 +192,8 @@ static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic) m5208_timer_state *s; int i; + qdev_warn_deprecated_function_used(); + /* SDRAMC. */ memory_region_init_io(iomem, NULL, &m5208_sys_ops, NULL, "m5208-sys", 0x00004000); memory_region_add_subregion(address_space, 0xfc0a8000, iomem);
This code hasn't been QOM'ified yet. Warn the user. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/m68k/mcf5206.c | 5 +++++ hw/m68k/mcf5208.c | 3 +++ 2 files changed, 8 insertions(+)