| Message ID | 20200608160044.15531-33-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/qdev: Warn when using pre-qdev/QOM devices | expand |
On 08/06/20 18:00, Philippe Mathieu-Daudé wrote: > This code hasn't been QOM'ified yet. Warn the user. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/riscv/riscv_htif.c | 4 ++++ > hw/riscv/sifive_uart.c | 4 ++++ > 2 files changed, 8 insertions(+) > > diff --git a/hw/riscv/riscv_htif.c b/hw/riscv/riscv_htif.c > index ca87a5cf9f..bd080dbefb 100644 > --- a/hw/riscv/riscv_htif.c > +++ b/hw/riscv/riscv_htif.c > @@ -30,6 +30,7 @@ > #include "hw/riscv/riscv_htif.h" > #include "qemu/timer.h" > #include "qemu/error-report.h" > +#include "hw/qdev-deprecated.h" > > #define RISCV_DEBUG_HTIF 0 > #define HTIF_DEBUG(fmt, ...) \ > @@ -238,6 +239,9 @@ HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem, > uint64_t fromhost_offset = fromhost_addr - base; > > HTIFState *s = g_malloc0(sizeof(HTIFState)); > + > + qdev_warn_deprecated_function_used(); > + > s->address_space = address_space; > s->main_mem = main_mem; > s->main_mem_ram_ptr = memory_region_get_ram_ptr(main_mem); > diff --git a/hw/riscv/sifive_uart.c b/hw/riscv/sifive_uart.c > index 9350482662..1a5890d5f7 100644 > --- a/hw/riscv/sifive_uart.c > +++ b/hw/riscv/sifive_uart.c > @@ -25,6 +25,7 @@ > #include "hw/hw.h" > #include "hw/irq.h" > #include "hw/riscv/sifive_uart.h" > +#include "hw/qdev-deprecated.h" > > /* > * Not yet implemented: > @@ -183,6 +184,9 @@ SiFiveUARTState *sifive_uart_create(MemoryRegion *address_space, hwaddr base, > Chardev *chr, qemu_irq irq) > { > SiFiveUARTState *s = g_malloc0(sizeof(SiFiveUARTState)); > + > + qdev_warn_deprecated_function_used(); > + > s->irq = irq; > qemu_chr_fe_init(&s->chr, chr, &error_abort); > qemu_chr_fe_set_handlers(&s->chr, uart_can_rx, uart_rx, uart_event, > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Not sure why this code was accepted, furthermore it should have been in hw/char. Paolo
diff --git a/hw/riscv/riscv_htif.c b/hw/riscv/riscv_htif.c index ca87a5cf9f..bd080dbefb 100644 --- a/hw/riscv/riscv_htif.c +++ b/hw/riscv/riscv_htif.c @@ -30,6 +30,7 @@ #include "hw/riscv/riscv_htif.h" #include "qemu/timer.h" #include "qemu/error-report.h" +#include "hw/qdev-deprecated.h" #define RISCV_DEBUG_HTIF 0 #define HTIF_DEBUG(fmt, ...) \ @@ -238,6 +239,9 @@ HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem, uint64_t fromhost_offset = fromhost_addr - base; HTIFState *s = g_malloc0(sizeof(HTIFState)); + + qdev_warn_deprecated_function_used(); + s->address_space = address_space; s->main_mem = main_mem; s->main_mem_ram_ptr = memory_region_get_ram_ptr(main_mem); diff --git a/hw/riscv/sifive_uart.c b/hw/riscv/sifive_uart.c index 9350482662..1a5890d5f7 100644 --- a/hw/riscv/sifive_uart.c +++ b/hw/riscv/sifive_uart.c @@ -25,6 +25,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/riscv/sifive_uart.h" +#include "hw/qdev-deprecated.h" /* * Not yet implemented: @@ -183,6 +184,9 @@ SiFiveUARTState *sifive_uart_create(MemoryRegion *address_space, hwaddr base, Chardev *chr, qemu_irq irq) { SiFiveUARTState *s = g_malloc0(sizeof(SiFiveUARTState)); + + qdev_warn_deprecated_function_used(); + s->irq = irq; qemu_chr_fe_init(&s->chr, chr, &error_abort); qemu_chr_fe_set_handlers(&s->chr, uart_can_rx, uart_rx, uart_event,
This code hasn't been QOM'ified yet. Warn the user. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/riscv/riscv_htif.c | 4 ++++ hw/riscv/sifive_uart.c | 4 ++++ 2 files changed, 8 insertions(+)