Patchwork hw/tcx: Remove unused 'addr' field and the property that sets it

login
register
mail settings
Submitter Peter Maydell
Date March 26, 2013, 12:35 p.m.
Message ID <1364301309-9414-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/231187/
State New
Headers show

Comments

Peter Maydell - March 26, 2013, 12:35 p.m.
Remove the 'addr' field from TCXState (since it is completely unused),
also the qdev property which sets it. This seems to be a relic from
many years past; devices don't need to know where they are mapped.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
Random minor cleanup, but I'm hoping we might be able to get rid of
the 'taddr' properties altogether; there aren't very many of them...

 hw/sparc/sun4m.c |    1 -
 hw/tcx.c         |    2 --
 2 files changed, 3 deletions(-)
Stefan Hajnoczi - March 28, 2013, 9:33 a.m.
On Tue, Mar 26, 2013 at 12:35:09PM +0000, Peter Maydell wrote:
> Remove the 'addr' field from TCXState (since it is completely unused),
> also the qdev property which sets it. This seems to be a relic from
> many years past; devices don't need to know where they are mapped.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> Random minor cleanup, but I'm hoping we might be able to get rid of
> the 'taddr' properties altogether; there aren't very many of them...
> 
>  hw/sparc/sun4m.c |    1 -
>  hw/tcx.c         |    2 --
>  2 files changed, 3 deletions(-)

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan

Patch

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 2f214da..9ebda02 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -575,7 +575,6 @@  static void tcx_init(hwaddr addr, int vram_size, int width,
     SysBusDevice *s;
 
     dev = qdev_create(NULL, "SUNW,tcx");
-    qdev_prop_set_taddr(dev, "addr", addr);
     qdev_prop_set_uint32(dev, "vram_size", vram_size);
     qdev_prop_set_uint16(dev, "width", width);
     qdev_prop_set_uint16(dev, "height", height);
diff --git a/hw/tcx.c b/hw/tcx.c
index f1edffd..c44068e 100644
--- a/hw/tcx.c
+++ b/hw/tcx.c
@@ -37,7 +37,6 @@ 
 
 typedef struct TCXState {
     SysBusDevice busdev;
-    hwaddr addr;
     QemuConsole *con;
     uint8_t *vram;
     uint32_t *vram24, *cplane;
@@ -707,7 +706,6 @@  write_err:
 }
 
 static Property tcx_properties[] = {
-    DEFINE_PROP_TADDR("addr",      TCXState, addr,      -1),
     DEFINE_PROP_HEX32("vram_size", TCXState, vram_size, -1),
     DEFINE_PROP_UINT16("width",    TCXState, width,     -1),
     DEFINE_PROP_UINT16("height",   TCXState, height,    -1),