Patchwork [qom-next,for-1.6,14/14] xilinx_uartlite: QOM'ify

login
register
mail settings
Submitter Andreas Färber
Date July 24, 2013, 9:42 p.m.
Message ID <1374702140-13771-15-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/261536/
State New
Headers show

Comments

Andreas Färber - July 24, 2013, 9:42 p.m.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/char/xilinx_uartlite.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
Edgar Iglesias - July 26, 2013, 3:05 a.m.
On Wed, Jul 24, 2013 at 11:42:19PM +0200, Andreas Färber wrote:
> Signed-off-by: Andreas Färber <afaerber@suse.de>

Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>


> ---
>  hw/char/xilinx_uartlite.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c
> index 929743c..b0d1d04 100644
> --- a/hw/char/xilinx_uartlite.c
> +++ b/hw/char/xilinx_uartlite.c
> @@ -46,8 +46,13 @@
>  #define CONTROL_RST_RX    0x02
>  #define CONTROL_IE        0x10
>  
> +#define TYPE_XILINX_UARTLITE "xlnx.xps-uartlite"
> +#define XILINX_UARTLITE(obj) \
> +    OBJECT_CHECK(XilinxUARTLite, (obj), TYPE_XILINX_UARTLITE)
> +
>  typedef struct XilinxUARTLite {
> -    SysBusDevice busdev;
> +    SysBusDevice parent_obj;
> +
>      MemoryRegion mmio;
>      CharDriverState *chr;
>      qemu_irq irq;
> @@ -193,7 +198,7 @@ static void uart_event(void *opaque, int event)
>  
>  static int xilinx_uartlite_init(SysBusDevice *dev)
>  {
> -    XilinxUARTLite *s = FROM_SYSBUS(typeof (*s), dev);
> +    XilinxUARTLite *s = XILINX_UARTLITE(dev);
>  
>      sysbus_init_irq(dev, &s->irq);
>  
> @@ -216,7 +221,7 @@ static void xilinx_uartlite_class_init(ObjectClass *klass, void *data)
>  }
>  
>  static const TypeInfo xilinx_uartlite_info = {
> -    .name          = "xlnx.xps-uartlite",
> +    .name          = TYPE_XILINX_UARTLITE,
>      .parent        = TYPE_SYS_BUS_DEVICE,
>      .instance_size = sizeof(XilinxUARTLite),
>      .class_init    = xilinx_uartlite_class_init,
> -- 
> 1.8.1.4
>

Patch

diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c
index 929743c..b0d1d04 100644
--- a/hw/char/xilinx_uartlite.c
+++ b/hw/char/xilinx_uartlite.c
@@ -46,8 +46,13 @@ 
 #define CONTROL_RST_RX    0x02
 #define CONTROL_IE        0x10
 
+#define TYPE_XILINX_UARTLITE "xlnx.xps-uartlite"
+#define XILINX_UARTLITE(obj) \
+    OBJECT_CHECK(XilinxUARTLite, (obj), TYPE_XILINX_UARTLITE)
+
 typedef struct XilinxUARTLite {
-    SysBusDevice busdev;
+    SysBusDevice parent_obj;
+
     MemoryRegion mmio;
     CharDriverState *chr;
     qemu_irq irq;
@@ -193,7 +198,7 @@  static void uart_event(void *opaque, int event)
 
 static int xilinx_uartlite_init(SysBusDevice *dev)
 {
-    XilinxUARTLite *s = FROM_SYSBUS(typeof (*s), dev);
+    XilinxUARTLite *s = XILINX_UARTLITE(dev);
 
     sysbus_init_irq(dev, &s->irq);
 
@@ -216,7 +221,7 @@  static void xilinx_uartlite_class_init(ObjectClass *klass, void *data)
 }
 
 static const TypeInfo xilinx_uartlite_info = {
-    .name          = "xlnx.xps-uartlite",
+    .name          = TYPE_XILINX_UARTLITE,
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(XilinxUARTLite),
     .class_init    = xilinx_uartlite_class_init,