[Qemu-devel] [PATCH v2 00/11] Xilinx Devs: refactored device and property names

[Qemu-devel] [PATCH v2 00/11] Xilinx Devs: refactored device and property names

[Peter A. G. Crosthwaite]

Refactored the device and property names of the Xilinx IP models to match those used by Xilinx in their tools.

This lays the groundwork for creating Xilinx IP machines from Xilinx generated sources (using -readconfig or -device arguments or dtb driven machine creation) without having to provide a translation layer to change from Xilinx names to QEMU names.

Peter A. G. Crosthwaite (11):
  xilinx_uartlite: changed device name
  xilinx_timer: added default frequency
  xilinx_timer: changed nr_timers to one_timer_only
  xilinx_timer: changed device name
  xilinx_intc: changed device name
  xilinx_ethlite: tweaked naming of ping-pong props
  xilinx_ethlite: changed device name
  xilinx_axienet: droped the c_ on parameters
  xilinx_axienet: changed device name
  xilinx_axidma: (un)reversed irq initialisation
  xilinx_axidma: changed device name

 hw/petalogix_ml605_mmu.c      |    2 +-
 hw/petalogix_s3adsp1800_mmu.c |    4 ++--
 hw/virtex_ml507.c             |    2 +-
 hw/xilinx.h                   |   30 +++++++++++++++---------------
 hw/xilinx_axidma.c            |    6 +++---
 hw/xilinx_axienet.c           |    6 +++---
 hw/xilinx_ethlite.c           |    9 +++++----
 hw/xilinx_intc.c              |    4 ++--
 hw/xilinx_timer.c             |   23 ++++++++++++++---------
 hw/xilinx_uartlite.c          |    5 +++--
 10 files changed, 49 insertions(+), 42 deletions(-)

-- 
1.7.3.2

[Qemu-devel] [PATCH v2 01/11] xilinx_uartlite: changed device name

[Peter A. G. Crosthwaite]

Changed device name to xlnx,xps-uartlite. This is the exact name of the device
in the xilinx EDK development tools.

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/petalogix_s3adsp1800_mmu.c |    2 +-
 hw/xilinx_uartlite.c          |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index f41c559..7d83c21 100644
--- a/hw/petalogix_s3adsp1800_mmu.c
+++ b/hw/petalogix_s3adsp1800_mmu.c
@@ -104,7 +104,7 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size,
         irq[i] = qdev_get_gpio_in(dev, i);
     }
 
-    sysbus_create_simple("xilinx,uartlite", UARTLITE_BASEADDR, irq[3]);
+    sysbus_create_simple("xlnx.xps-uartlite", UARTLITE_BASEADDR, irq[3]);
     /* 2 timers at irq 2 @ 62 Mhz.  */
     xilinx_timer_create(TIMER_BASEADDR, irq[0], 2, 62 * 1000000);
     xilinx_ethlite_create(&nd_table[0], ETHLITE_BASEADDR, irq[1], 0, 0);
diff --git a/hw/xilinx_uartlite.c b/hw/xilinx_uartlite.c
index aa0170d..d0f32db 100644
--- a/hw/xilinx_uartlite.c
+++ b/hw/xilinx_uartlite.c
@@ -202,7 +202,8 @@ static int xilinx_uartlite_init(SysBusDevice *dev)
     sysbus_init_irq(dev, &s->irq);
 
     uart_update_status(s);
-    memory_region_init_io(&s->mmio, &uart_ops, s, "xilinx-uartlite", R_MAX * 4);
+    memory_region_init_io(&s->mmio, &uart_ops, s, "xlnx.xps-uartlite",
+                                                                R_MAX * 4);
     sysbus_init_mmio(dev, &s->mmio);
 
     s->chr = qemu_char_get_next_serial();
@@ -219,7 +220,7 @@ static void xilinx_uartlite_class_init(ObjectClass *klass, void *data)
 }
 
 static TypeInfo xilinx_uartlite_info = {
-    .name          = "xilinx,uartlite",
+    .name          = "xlnx.xps-uartlite",
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof (struct xlx_uartlite),
     .class_init    = xilinx_uartlite_class_init,
-- 
1.7.3.2

Re: [Qemu-devel] [PATCH v2 01/11] xilinx_uartlite: changed device name

[Andreas Färber]

Am 13.06.2012 06:46, schrieb Peter A. G. Crosthwaite:
> Changed device name to xlnx,xps-uartlite. This is the exact name of the device
> in the xilinx EDK development tools.
> 
> Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>

Dito.

/-F

> ---
>  hw/petalogix_s3adsp1800_mmu.c |    2 +-
>  hw/xilinx_uartlite.c          |    5 +++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
> index f41c559..7d83c21 100644
> --- a/hw/petalogix_s3adsp1800_mmu.c
> +++ b/hw/petalogix_s3adsp1800_mmu.c
> @@ -104,7 +104,7 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size,
>          irq[i] = qdev_get_gpio_in(dev, i);
>      }
>  
> -    sysbus_create_simple("xilinx,uartlite", UARTLITE_BASEADDR, irq[3]);
> +    sysbus_create_simple("xlnx.xps-uartlite", UARTLITE_BASEADDR, irq[3]);
>      /* 2 timers at irq 2 @ 62 Mhz.  */
>      xilinx_timer_create(TIMER_BASEADDR, irq[0], 2, 62 * 1000000);
>      xilinx_ethlite_create(&nd_table[0], ETHLITE_BASEADDR, irq[1], 0, 0);
> diff --git a/hw/xilinx_uartlite.c b/hw/xilinx_uartlite.c
> index aa0170d..d0f32db 100644
> --- a/hw/xilinx_uartlite.c
> +++ b/hw/xilinx_uartlite.c
> @@ -202,7 +202,8 @@ static int xilinx_uartlite_init(SysBusDevice *dev)
>      sysbus_init_irq(dev, &s->irq);
>  
>      uart_update_status(s);
> -    memory_region_init_io(&s->mmio, &uart_ops, s, "xilinx-uartlite", R_MAX * 4);
> +    memory_region_init_io(&s->mmio, &uart_ops, s, "xlnx.xps-uartlite",
> +                                                                R_MAX * 4);
>      sysbus_init_mmio(dev, &s->mmio);
>  
>      s->chr = qemu_char_get_next_serial();
> @@ -219,7 +220,7 @@ static void xilinx_uartlite_class_init(ObjectClass *klass, void *data)
>  }
>  
>  static TypeInfo xilinx_uartlite_info = {
> -    .name          = "xilinx,uartlite",
> +    .name          = "xlnx.xps-uartlite",
>      .parent        = TYPE_SYS_BUS_DEVICE,
>      .instance_size = sizeof (struct xlx_uartlite),
>      .class_init    = xilinx_uartlite_class_init,


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

[Qemu-devel] [PATCH v2 02/11] xilinx_timer: added default frequency

[Peter A. G. Crosthwaite]

Added a reasonable default frequency for the xilinx timer (the 62MHz from
s3adsp machine model).

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/xilinx_timer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c
index 3ab2f2b..e9fde28 100644
--- a/hw/xilinx_timer.c
+++ b/hw/xilinx_timer.c
@@ -220,7 +220,7 @@ static int xilinx_timer_init(SysBusDevice *dev)
 }
 
 static Property xilinx_timer_properties[] = {
-    DEFINE_PROP_UINT32("frequency", struct timerblock, freq_hz,   0),
+    DEFINE_PROP_UINT32("frequency", struct timerblock, freq_hz,   62 * 1000000),
     DEFINE_PROP_UINT32("nr-timers", struct timerblock, nr_timers, 0),
     DEFINE_PROP_END_OF_LIST(),
 };
-- 
1.7.3.2

[Qemu-devel] [PATCH v2 03/11] xilinx_timer: changed nr_timers to one_timer_only

[Peter A. G. Crosthwaite]

The configurable property for this IP in the Xilinx tools is a boolean switch
"one-timer-only" that flicks this timer from being dual channel to single.
Updated QEMU to work the same way for better match with the IP core and its TRM.

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/petalogix_ml605_mmu.c      |    2 +-
 hw/petalogix_s3adsp1800_mmu.c |    2 +-
 hw/virtex_ml507.c             |    2 +-
 hw/xilinx.h                   |    4 ++--
 hw/xilinx_timer.c             |   17 +++++++++++------
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c
index bff63e3..6a7d0c0 100644
--- a/hw/petalogix_ml605_mmu.c
+++ b/hw/petalogix_ml605_mmu.c
@@ -123,7 +123,7 @@ petalogix_ml605_init(ram_addr_t ram_size,
                    irq[5], 115200, serial_hds[0], DEVICE_LITTLE_ENDIAN);
 
     /* 2 timers at irq 2 @ 100 Mhz.  */
-    xilinx_timer_create(TIMER_BASEADDR, irq[2], 2, 100 * 1000000);
+    xilinx_timer_create(TIMER_BASEADDR, irq[2], 0, 100 * 1000000);
 
     /* axi ethernet and dma initialization. TODO: Dynamically connect them.  */
     {
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index 7d83c21..2cf6882 100644
--- a/hw/petalogix_s3adsp1800_mmu.c
+++ b/hw/petalogix_s3adsp1800_mmu.c
@@ -106,7 +106,7 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size,
 
     sysbus_create_simple("xlnx.xps-uartlite", UARTLITE_BASEADDR, irq[3]);
     /* 2 timers at irq 2 @ 62 Mhz.  */
-    xilinx_timer_create(TIMER_BASEADDR, irq[0], 2, 62 * 1000000);
+    xilinx_timer_create(TIMER_BASEADDR, irq[0], 0, 62 * 1000000);
     xilinx_ethlite_create(&nd_table[0], ETHLITE_BASEADDR, irq[1], 0, 0);
 
     microblaze_load_kernel(cpu, ddr_base, ram_size,
diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index cace86b..79bc0d1 100644
--- a/hw/virtex_ml507.c
+++ b/hw/virtex_ml507.c
@@ -229,7 +229,7 @@ static void virtex_init(ram_addr_t ram_size,
                    serial_hds[0], DEVICE_LITTLE_ENDIAN);
 
     /* 2 timers at irq 2 @ 62 Mhz.  */
-    xilinx_timer_create(0x83c00000, irq[3], 2, 62 * 1000000);
+    xilinx_timer_create(0x83c00000, irq[3], 0, 62 * 1000000);
 
     if (kernel_filename) {
         uint64_t entry, low, high;
diff --git a/hw/xilinx.h b/hw/xilinx.h
index 35f35bd..7b8ad51 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -16,12 +16,12 @@ xilinx_intc_create(target_phys_addr_t base, qemu_irq irq, int kind_of_intr)
 
 /* OPB Timer/Counter.  */
 static inline DeviceState *
-xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, int nr, int freq)
+xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, int oto, int freq)
 {
     DeviceState *dev;
 
     dev = qdev_create(NULL, "xilinx,timer");
-    qdev_prop_set_uint32(dev, "nr-timers", nr);
+    qdev_prop_set_uint32(dev, "one-timer-only", oto);
     qdev_prop_set_uint32(dev, "frequency", freq);
     qdev_init_nofail(dev);
     sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c
index e9fde28..72f7c0d 100644
--- a/hw/xilinx_timer.c
+++ b/hw/xilinx_timer.c
@@ -62,11 +62,16 @@ struct timerblock
     SysBusDevice busdev;
     MemoryRegion mmio;
     qemu_irq irq;
-    uint32_t nr_timers;
+    uint8_t one_timer_only;
     uint32_t freq_hz;
     struct xlx_timer *timers;
 };
 
+static inline unsigned int num_timers(struct timerblock *t)
+{
+    return 2 - t->one_timer_only;
+}
+
 static inline unsigned int timer_from_addr(target_phys_addr_t addr)
 {
     /* Timers get a 4x32bit control reg area each.  */
@@ -78,7 +83,7 @@ static void timer_update_irq(struct timerblock *t)
     unsigned int i, irq = 0;
     uint32_t csr;
 
-    for (i = 0; i < t->nr_timers; i++) {
+    for (i = 0; i < num_timers(t); i++) {
         csr = t->timers[i].regs[R_TCSR];
         irq |= (csr & TCSR_TINT) && (csr & TCSR_ENIT);
     }
@@ -202,8 +207,8 @@ static int xilinx_timer_init(SysBusDevice *dev)
     sysbus_init_irq(dev, &t->irq);
 
     /* Init all the ptimers.  */
-    t->timers = g_malloc0(sizeof t->timers[0] * t->nr_timers);
-    for (i = 0; i < t->nr_timers; i++) {
+    t->timers = g_malloc0(sizeof t->timers[0] * num_timers(t));
+    for (i = 0; i < num_timers(t); i++) {
         struct xlx_timer *xt = &t->timers[i];
 
         xt->parent = t;
@@ -214,14 +219,14 @@ static int xilinx_timer_init(SysBusDevice *dev)
     }
 
     memory_region_init_io(&t->mmio, &timer_ops, t, "xilinx-timer",
-                          R_MAX * 4 * t->nr_timers);
+                          R_MAX * 4 * num_timers(t));
     sysbus_init_mmio(dev, &t->mmio);
     return 0;
 }
 
 static Property xilinx_timer_properties[] = {
     DEFINE_PROP_UINT32("frequency", struct timerblock, freq_hz,   62 * 1000000),
-    DEFINE_PROP_UINT32("nr-timers", struct timerblock, nr_timers, 0),
+    DEFINE_PROP_UINT8("one-timer-only", struct timerblock, one_timer_only, 0),
     DEFINE_PROP_END_OF_LIST(),
 };
 
-- 
1.7.3.2

[Qemu-devel] [PATCH v2 04/11] xilinx_timer: changed device name

[Peter A. G. Crosthwaite]

Changed device name to xlnx,xps-timer. This is the exact name of the device
in the xilinx EDK development tools.

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/xilinx.h       |    2 +-
 hw/xilinx_timer.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/xilinx.h b/hw/xilinx.h
index 7b8ad51..9ff4c2b 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -20,7 +20,7 @@ xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, int oto, int freq)
 {
     DeviceState *dev;
 
-    dev = qdev_create(NULL, "xilinx,timer");
+    dev = qdev_create(NULL, "xlnx,xps-timer");
     qdev_prop_set_uint32(dev, "one-timer-only", oto);
     qdev_prop_set_uint32(dev, "frequency", freq);
     qdev_init_nofail(dev);
diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c
index 72f7c0d..0683ce1 100644
--- a/hw/xilinx_timer.c
+++ b/hw/xilinx_timer.c
@@ -218,7 +218,7 @@ static int xilinx_timer_init(SysBusDevice *dev)
         ptimer_set_freq(xt->ptimer, t->freq_hz);
     }
 
-    memory_region_init_io(&t->mmio, &timer_ops, t, "xilinx-timer",
+    memory_region_init_io(&t->mmio, &timer_ops, t, "xlnx,xps-timer",
                           R_MAX * 4 * num_timers(t));
     sysbus_init_mmio(dev, &t->mmio);
     return 0;
@@ -240,7 +240,7 @@ static void xilinx_timer_class_init(ObjectClass *klass, void *data)
 }
 
 static TypeInfo xilinx_timer_info = {
-    .name          = "xilinx,timer",
+    .name          = "xlnx,xps-timer",
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(struct timerblock),
     .class_init    = xilinx_timer_class_init,
-- 
1.7.3.2

[Qemu-devel] [PATCH v2 05/11] xilinx_intc: changed device name

[Peter A. G. Crosthwaite]

Changed device name to xlnx,xps-intc. This is the exact name of the device
in the xilinx EDK development tools.

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/xilinx.h      |    2 +-
 hw/xilinx_intc.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/xilinx.h b/hw/xilinx.h
index 9ff4c2b..c183e2f 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -6,7 +6,7 @@ xilinx_intc_create(target_phys_addr_t base, qemu_irq irq, int kind_of_intr)
 {
     DeviceState *dev;
 
-    dev = qdev_create(NULL, "xilinx,intc");
+    dev = qdev_create(NULL, "xlnx.xps-intc");
     qdev_prop_set_uint32(dev, "kind-of-intr", kind_of_intr);
     qdev_init_nofail(dev);
     sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
diff --git a/hw/xilinx_intc.c b/hw/xilinx_intc.c
index 553f848..386fd30 100644
--- a/hw/xilinx_intc.c
+++ b/hw/xilinx_intc.c
@@ -156,7 +156,7 @@ static int xilinx_intc_init(SysBusDevice *dev)
     qdev_init_gpio_in(&dev->qdev, irq_handler, 32);
     sysbus_init_irq(dev, &p->parent_irq);
 
-    memory_region_init_io(&p->mmio, &pic_ops, p, "xilinx-pic", R_MAX * 4);
+    memory_region_init_io(&p->mmio, &pic_ops, p, "xlnx.xps-intc", R_MAX * 4);
     sysbus_init_mmio(dev, &p->mmio);
     return 0;
 }
@@ -176,7 +176,7 @@ static void xilinx_intc_class_init(ObjectClass *klass, void *data)
 }
 
 static TypeInfo xilinx_intc_info = {
-    .name          = "xilinx,intc",
+    .name          = "xlnx.xps-intc",
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(struct xlx_pic),
     .class_init    = xilinx_intc_class_init,
-- 
1.7.3.2

Re: [Qemu-devel] [PATCH v2 05/11] xilinx_intc: changed device name

[Andreas Färber]

Am 13.06.2012 06:46, schrieb Peter A. G. Crosthwaite:
> Changed device name to xlnx,xps-intc. This is the exact name of the device
> in the xilinx EDK development tools.
> 
> Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>

Dito.

/-F

> ---
>  hw/xilinx.h      |    2 +-
>  hw/xilinx_intc.c |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/xilinx.h b/hw/xilinx.h
> index 9ff4c2b..c183e2f 100644
> --- a/hw/xilinx.h
> +++ b/hw/xilinx.h
> @@ -6,7 +6,7 @@ xilinx_intc_create(target_phys_addr_t base, qemu_irq irq, int kind_of_intr)
>  {
>      DeviceState *dev;
>  
> -    dev = qdev_create(NULL, "xilinx,intc");
> +    dev = qdev_create(NULL, "xlnx.xps-intc");
>      qdev_prop_set_uint32(dev, "kind-of-intr", kind_of_intr);
>      qdev_init_nofail(dev);
>      sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
> diff --git a/hw/xilinx_intc.c b/hw/xilinx_intc.c
> index 553f848..386fd30 100644
> --- a/hw/xilinx_intc.c
> +++ b/hw/xilinx_intc.c
> @@ -156,7 +156,7 @@ static int xilinx_intc_init(SysBusDevice *dev)
>      qdev_init_gpio_in(&dev->qdev, irq_handler, 32);
>      sysbus_init_irq(dev, &p->parent_irq);
>  
> -    memory_region_init_io(&p->mmio, &pic_ops, p, "xilinx-pic", R_MAX * 4);
> +    memory_region_init_io(&p->mmio, &pic_ops, p, "xlnx.xps-intc", R_MAX * 4);
>      sysbus_init_mmio(dev, &p->mmio);
>      return 0;
>  }
> @@ -176,7 +176,7 @@ static void xilinx_intc_class_init(ObjectClass *klass, void *data)
>  }
>  
>  static TypeInfo xilinx_intc_info = {
> -    .name          = "xilinx,intc",
> +    .name          = "xlnx.xps-intc",
>      .parent        = TYPE_SYS_BUS_DEVICE,
>      .instance_size = sizeof(struct xlx_pic),
>      .class_init    = xilinx_intc_class_init,


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

[Qemu-devel] [PATCH v2 06/11] xilinx_ethlite: tweaked naming of ping-pong props

[Peter A. G. Crosthwaite]

Changed "txpingpong" prop to "tx-ping-pong". Same for rx. This is done to
make the property name exactly match what is output by the xilinx tools for
this IP.

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/xilinx.h         |    4 ++--
 hw/xilinx_ethlite.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/xilinx.h b/hw/xilinx.h
index c183e2f..7776e1b 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -40,8 +40,8 @@ xilinx_ethlite_create(NICInfo *nd, target_phys_addr_t base, qemu_irq irq,
 
     dev = qdev_create(NULL, "xilinx,ethlite");
     qdev_set_nic_properties(dev, nd);
-    qdev_prop_set_uint32(dev, "txpingpong", txpingpong);
-    qdev_prop_set_uint32(dev, "rxpingpong", rxpingpong);
+    qdev_prop_set_uint32(dev, "tx-ping-pong", txpingpong);
+    qdev_prop_set_uint32(dev, "rx-ping-pong", rxpingpong);
     qdev_init_nofail(dev);
     sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
     sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq);
diff --git a/hw/xilinx_ethlite.c b/hw/xilinx_ethlite.c
index 857b33d..aa02715 100644
--- a/hw/xilinx_ethlite.c
+++ b/hw/xilinx_ethlite.c
@@ -227,8 +227,8 @@ static int xilinx_ethlite_init(SysBusDevice *dev)
 }
 
 static Property xilinx_ethlite_properties[] = {
-    DEFINE_PROP_UINT32("txpingpong", struct xlx_ethlite, c_tx_pingpong, 1),
-    DEFINE_PROP_UINT32("rxpingpong", struct xlx_ethlite, c_rx_pingpong, 1),
+    DEFINE_PROP_UINT32("tx-ping-pong", struct xlx_ethlite, c_tx_pingpong, 1),
+    DEFINE_PROP_UINT32("rx-ping-pong", struct xlx_ethlite, c_rx_pingpong, 1),
     DEFINE_NIC_PROPERTIES(struct xlx_ethlite, conf),
     DEFINE_PROP_END_OF_LIST(),
 };
-- 
1.7.3.2

[Qemu-devel] [PATCH v2 07/11] xilinx_ethlite: changed device name

[Peter A. G. Crosthwaite]

Changed device name to xlnx,xps-ethernetlite. This is the exact name of the
device in the xilinx EDK development tools.

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/xilinx.h         |    4 ++--
 hw/xilinx_ethlite.c |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/hw/xilinx.h b/hw/xilinx.h
index 7776e1b..5f7c5e9 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -36,9 +36,9 @@ xilinx_ethlite_create(NICInfo *nd, target_phys_addr_t base, qemu_irq irq,
 {
     DeviceState *dev;
 
-    qemu_check_nic_model(nd, "xilinx-ethlite");
+    qemu_check_nic_model(nd, "xlnx.xps-ethernetlite");
 
-    dev = qdev_create(NULL, "xilinx,ethlite");
+    dev = qdev_create(NULL, "xlnx.xps-ethernetlite");
     qdev_set_nic_properties(dev, nd);
     qdev_prop_set_uint32(dev, "tx-ping-pong", txpingpong);
     qdev_prop_set_uint32(dev, "rx-ping-pong", rxpingpong);
diff --git a/hw/xilinx_ethlite.c b/hw/xilinx_ethlite.c
index aa02715..affbb8b 100644
--- a/hw/xilinx_ethlite.c
+++ b/hw/xilinx_ethlite.c
@@ -216,7 +216,8 @@ static int xilinx_ethlite_init(SysBusDevice *dev)
     sysbus_init_irq(dev, &s->irq);
     s->rxbuf = 0;
 
-    memory_region_init_io(&s->mmio, &eth_ops, s, "xilinx-ethlite", R_MAX * 4);
+    memory_region_init_io(&s->mmio, &eth_ops, s, "xlnx.xps-ethernetlite",
+                                                                    R_MAX * 4);
     sysbus_init_mmio(dev, &s->mmio);
 
     qemu_macaddr_default_if_unset(&s->conf.macaddr);
@@ -243,7 +244,7 @@ static void xilinx_ethlite_class_init(ObjectClass *klass, void *data)
 }
 
 static TypeInfo xilinx_ethlite_info = {
-    .name          = "xilinx,ethlite",
+    .name          = "xlnx.xps-ethernetlite",
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(struct xlx_ethlite),
     .class_init    = xilinx_ethlite_class_init,
-- 
1.7.3.2

Re: [Qemu-devel] [PATCH v2 07/11] xilinx_ethlite: changed device name

[Andreas Färber]

Am 13.06.2012 06:46, schrieb Peter A. G. Crosthwaite:
> Changed device name to xlnx,xps-ethernetlite. This is the exact name of the
> device in the xilinx EDK development tools.
> 
> Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>

Dito.

/-F

> ---
>  hw/xilinx.h         |    4 ++--
>  hw/xilinx_ethlite.c |    5 +++--
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/xilinx.h b/hw/xilinx.h
> index 7776e1b..5f7c5e9 100644
> --- a/hw/xilinx.h
> +++ b/hw/xilinx.h
> @@ -36,9 +36,9 @@ xilinx_ethlite_create(NICInfo *nd, target_phys_addr_t base, qemu_irq irq,
>  {
>      DeviceState *dev;
>  
> -    qemu_check_nic_model(nd, "xilinx-ethlite");
> +    qemu_check_nic_model(nd, "xlnx.xps-ethernetlite");
>  
> -    dev = qdev_create(NULL, "xilinx,ethlite");
> +    dev = qdev_create(NULL, "xlnx.xps-ethernetlite");
>      qdev_set_nic_properties(dev, nd);
>      qdev_prop_set_uint32(dev, "tx-ping-pong", txpingpong);
>      qdev_prop_set_uint32(dev, "rx-ping-pong", rxpingpong);
> diff --git a/hw/xilinx_ethlite.c b/hw/xilinx_ethlite.c
> index aa02715..affbb8b 100644
> --- a/hw/xilinx_ethlite.c
> +++ b/hw/xilinx_ethlite.c
> @@ -216,7 +216,8 @@ static int xilinx_ethlite_init(SysBusDevice *dev)
>      sysbus_init_irq(dev, &s->irq);
>      s->rxbuf = 0;
>  
> -    memory_region_init_io(&s->mmio, &eth_ops, s, "xilinx-ethlite", R_MAX * 4);
> +    memory_region_init_io(&s->mmio, &eth_ops, s, "xlnx.xps-ethernetlite",
> +                                                                    R_MAX * 4);
>      sysbus_init_mmio(dev, &s->mmio);
>  
>      qemu_macaddr_default_if_unset(&s->conf.macaddr);
> @@ -243,7 +244,7 @@ static void xilinx_ethlite_class_init(ObjectClass *klass, void *data)
>  }
>  
>  static TypeInfo xilinx_ethlite_info = {
> -    .name          = "xilinx,ethlite",
> +    .name          = "xlnx.xps-ethernetlite",
>      .parent        = TYPE_SYS_BUS_DEVICE,
>      .instance_size = sizeof(struct xlx_ethlite),
>      .class_init    = xilinx_ethlite_class_init,


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

[Qemu-devel] [PATCH v2 08/11] xilinx_axienet: droped the c_ on parameters

[Peter A. G. Crosthwaite]

Even though the xilinx tools do have C_ on all params by default, drop this
for consistency with all the other xilinx IP (I.E. param names are the xilinx
names without the C_ prefix)

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/xilinx.h         |    4 ++--
 hw/xilinx_axienet.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/xilinx.h b/hw/xilinx.h
index 5f7c5e9..5108cf5 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -58,8 +58,8 @@ xilinx_axiethernet_create(void *dmach,
 
     dev = qdev_create(NULL, "xilinx,axienet");
     qdev_set_nic_properties(dev, nd);
-    qdev_prop_set_uint32(dev, "c_rxmem", rxmem);
-    qdev_prop_set_uint32(dev, "c_txmem", txmem);
+    qdev_prop_set_uint32(dev, "rxmem", rxmem);
+    qdev_prop_set_uint32(dev, "txmem", txmem);
     qdev_prop_set_ptr(dev, "dmach", dmach);
     qdev_init_nofail(dev);
     sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c
index 7526273..d383aee 100644
--- a/hw/xilinx_axienet.c
+++ b/hw/xilinx_axienet.c
@@ -872,8 +872,8 @@ static int xilinx_enet_init(SysBusDevice *dev)
 
 static Property xilinx_enet_properties[] = {
     DEFINE_PROP_UINT32("phyaddr", struct XilinxAXIEnet, c_phyaddr, 7),
-    DEFINE_PROP_UINT32("c_rxmem", struct XilinxAXIEnet, c_rxmem, 0x1000),
-    DEFINE_PROP_UINT32("c_txmem", struct XilinxAXIEnet, c_txmem, 0x1000),
+    DEFINE_PROP_UINT32("rxmem", struct XilinxAXIEnet, c_rxmem, 0x1000),
+    DEFINE_PROP_UINT32("txmem", struct XilinxAXIEnet, c_txmem, 0x1000),
     DEFINE_PROP_PTR("dmach", struct XilinxAXIEnet, dmach),
     DEFINE_NIC_PROPERTIES(struct XilinxAXIEnet, conf),
     DEFINE_PROP_END_OF_LIST(),
-- 
1.7.3.2

[Qemu-devel] [PATCH v2 09/11] xilinx_axienet: changed device name

[Peter A. G. Crosthwaite]

Changed device name to xlnx,axi-ethernet. This is the exact name of the
device in the xilinx EDK development tools.

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/xilinx.h         |    4 ++--
 hw/xilinx_axienet.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/xilinx.h b/hw/xilinx.h
index 5108cf5..52fce01 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -54,9 +54,9 @@ xilinx_axiethernet_create(void *dmach,
                           int txmem, int rxmem)
 {
     DeviceState *dev;
-    qemu_check_nic_model(nd, "xilinx-axienet");
+    qemu_check_nic_model(nd, "xlnx.axi-ethernet");
 
-    dev = qdev_create(NULL, "xilinx,axienet");
+    dev = qdev_create(NULL, "xlnx.axi-ethernet");
     qdev_set_nic_properties(dev, nd);
     qdev_prop_set_uint32(dev, "rxmem", rxmem);
     qdev_prop_set_uint32(dev, "txmem", txmem);
diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c
index d383aee..2e8d8a5 100644
--- a/hw/xilinx_axienet.c
+++ b/hw/xilinx_axienet.c
@@ -889,7 +889,7 @@ static void xilinx_enet_class_init(ObjectClass *klass, void *data)
 }
 
 static TypeInfo xilinx_enet_info = {
-    .name          = "xilinx,axienet",
+    .name          = "xlnx.axi-ethernet",
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(struct XilinxAXIEnet),
     .class_init    = xilinx_enet_class_init,
-- 
1.7.3.2

Re: [Qemu-devel] [PATCH v2 09/11] xilinx_axienet: changed device name

[Andreas Färber]

Am 13.06.2012 06:46, schrieb Peter A. G. Crosthwaite:
> Changed device name to xlnx,axi-ethernet. This is the exact name of the
> device in the xilinx EDK development tools.
> 
> Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>

Commit message doesn't match the change. Which one is right?

/-F

> ---
>  hw/xilinx.h         |    4 ++--
>  hw/xilinx_axienet.c |    2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/xilinx.h b/hw/xilinx.h
> index 5108cf5..52fce01 100644
> --- a/hw/xilinx.h
> +++ b/hw/xilinx.h
> @@ -54,9 +54,9 @@ xilinx_axiethernet_create(void *dmach,
>                            int txmem, int rxmem)
>  {
>      DeviceState *dev;
> -    qemu_check_nic_model(nd, "xilinx-axienet");
> +    qemu_check_nic_model(nd, "xlnx.axi-ethernet");
>  
> -    dev = qdev_create(NULL, "xilinx,axienet");
> +    dev = qdev_create(NULL, "xlnx.axi-ethernet");
>      qdev_set_nic_properties(dev, nd);
>      qdev_prop_set_uint32(dev, "rxmem", rxmem);
>      qdev_prop_set_uint32(dev, "txmem", txmem);
> diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c
> index d383aee..2e8d8a5 100644
> --- a/hw/xilinx_axienet.c
> +++ b/hw/xilinx_axienet.c
> @@ -889,7 +889,7 @@ static void xilinx_enet_class_init(ObjectClass *klass, void *data)
>  }
>  
>  static TypeInfo xilinx_enet_info = {
> -    .name          = "xilinx,axienet",
> +    .name          = "xlnx.axi-ethernet",
>      .parent        = TYPE_SYS_BUS_DEVICE,
>      .instance_size = sizeof(struct XilinxAXIEnet),
>      .class_init    = xilinx_enet_class_init,

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

[Qemu-devel] [PATCH v2 10/11] xilinx_axidma: (un)reversed irq initialisation

[Peter A. G. Crosthwaite]

The axidma irq orders are reversed in both the device model and the instantion.
Undid both reversal (for no net change). Also needs to be reversed for
consistency with Xilinx tools IRQ listing.

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/xilinx.h        |    4 ++--
 hw/xilinx_axidma.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/xilinx.h b/hw/xilinx.h
index 52fce01..8f915b4 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -81,8 +81,8 @@ xilinx_axiethernetdma_create(void *dmach,
     qdev_init_nofail(dev);
 
     sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
-    sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq2);
-    sysbus_connect_irq(sysbus_from_qdev(dev), 1, irq);
+    sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq);
+    sysbus_connect_irq(sysbus_from_qdev(dev), 1, irq2);
 
     return dev;
 }
diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c
index 85dfcbf..59373b5 100644
--- a/hw/xilinx_axidma.c
+++ b/hw/xilinx_axidma.c
@@ -463,8 +463,8 @@ static int xilinx_axidma_init(SysBusDevice *dev)
     struct XilinxAXIDMA *s = FROM_SYSBUS(typeof(*s), dev);
     int i;
 
-    sysbus_init_irq(dev, &s->streams[1].irq);
     sysbus_init_irq(dev, &s->streams[0].irq);
+    sysbus_init_irq(dev, &s->streams[1].irq);
 
     if (!s->dmach) {
         hw_error("Unconnected DMA channel.\n");
-- 
1.7.3.2

[Qemu-devel] [PATCH v2 11/11] xilinx_axidma: changed device name

[Peter A. G. Crosthwaite]

Changed device name to xlnx,axi-dma. This is the exact name of the device in the
Xilinx EDK development tools.

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/xilinx.h        |    2 +-
 hw/xilinx_axidma.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/xilinx.h b/hw/xilinx.h
index 8f915b4..7df21eb 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -75,7 +75,7 @@ xilinx_axiethernetdma_create(void *dmach,
 {
     DeviceState *dev = NULL;
 
-    dev = qdev_create(NULL, "xilinx,axidma");
+    dev = qdev_create(NULL, "xlnx.axi-dma");
     qdev_prop_set_uint32(dev, "freqhz", freqhz);
     qdev_prop_set_ptr(dev, "dmach", dmach);
     qdev_init_nofail(dev);
diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c
index 59373b5..f4bec37 100644
--- a/hw/xilinx_axidma.c
+++ b/hw/xilinx_axidma.c
@@ -473,7 +473,7 @@ static int xilinx_axidma_init(SysBusDevice *dev)
     xlx_dma_connect_dma(s->dmach, s, axidma_push);
 
     memory_region_init_io(&s->iomem, &axidma_ops, s,
-                          "axidma", R_MAX * 4 * 2);
+                          "xlnx.axi-dma", R_MAX * 4 * 2);
     sysbus_init_mmio(dev, &s->iomem);
 
     for (i = 0; i < 2; i++) {
@@ -502,7 +502,7 @@ static void axidma_class_init(ObjectClass *klass, void *data)
 }
 
 static TypeInfo axidma_info = {
-    .name          = "xilinx,axidma",
+    .name          = "xlnx.axi-dma",
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(struct XilinxAXIDMA),
     .class_init    = axidma_class_init,
-- 
1.7.3.2

Re: [Qemu-devel] [PATCH v2 11/11] xilinx_axidma: changed device name

[Andreas Färber]

Am 13.06.2012 06:46, schrieb Peter A. G. Crosthwaite:
> Changed device name to xlnx,axi-dma. This is the exact name of the device in the
> Xilinx EDK development tools.
> 
> Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>

Same here. Please review more carefully.

/-F

> ---
>  hw/xilinx.h        |    2 +-
>  hw/xilinx_axidma.c |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/xilinx.h b/hw/xilinx.h
> index 8f915b4..7df21eb 100644
> --- a/hw/xilinx.h
> +++ b/hw/xilinx.h
> @@ -75,7 +75,7 @@ xilinx_axiethernetdma_create(void *dmach,
>  {
>      DeviceState *dev = NULL;
>  
> -    dev = qdev_create(NULL, "xilinx,axidma");
> +    dev = qdev_create(NULL, "xlnx.axi-dma");
>      qdev_prop_set_uint32(dev, "freqhz", freqhz);
>      qdev_prop_set_ptr(dev, "dmach", dmach);
>      qdev_init_nofail(dev);
> diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c
> index 59373b5..f4bec37 100644
> --- a/hw/xilinx_axidma.c
> +++ b/hw/xilinx_axidma.c
> @@ -473,7 +473,7 @@ static int xilinx_axidma_init(SysBusDevice *dev)
>      xlx_dma_connect_dma(s->dmach, s, axidma_push);
>  
>      memory_region_init_io(&s->iomem, &axidma_ops, s,
> -                          "axidma", R_MAX * 4 * 2);
> +                          "xlnx.axi-dma", R_MAX * 4 * 2);
>      sysbus_init_mmio(dev, &s->iomem);
>  
>      for (i = 0; i < 2; i++) {
> @@ -502,7 +502,7 @@ static void axidma_class_init(ObjectClass *klass, void *data)
>  }
>  
>  static TypeInfo axidma_info = {
> -    .name          = "xilinx,axidma",
> +    .name          = "xlnx.axi-dma",
>      .parent        = TYPE_SYS_BUS_DEVICE,
>      .instance_size = sizeof(struct XilinxAXIDMA),
>      .class_init    = axidma_class_init,


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH v2 11/11] xilinx_axidma: changed device name

[Edgar E. Iglesias]

On Fri, Jun 15, 2012 at 01:30:17PM +0200, Andreas Färber wrote:
> Am 13.06.2012 06:46, schrieb Peter A. G. Crosthwaite:
> > Changed device name to xlnx,axi-dma. This is the exact name of the device in the
> > Xilinx EDK development tools.
> > 
> > Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
> 
> Same here. Please review more carefully.

Code is an approximation of the real name. Commas are not ok
in QEMU, so dot will do.
If you wan't quality reviews, pay somebody to verify comments vs code.

I'll review best effort when time permits until somone pays me for
doing better. Dont matter what you or anyone says.

Cheers



> 
> /-F
> 
> > ---
> >  hw/xilinx.h        |    2 +-
> >  hw/xilinx_axidma.c |    4 ++--
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/hw/xilinx.h b/hw/xilinx.h
> > index 8f915b4..7df21eb 100644
> > --- a/hw/xilinx.h
> > +++ b/hw/xilinx.h
> > @@ -75,7 +75,7 @@ xilinx_axiethernetdma_create(void *dmach,
> >  {
> >      DeviceState *dev = NULL;
> >  
> > -    dev = qdev_create(NULL, "xilinx,axidma");
> > +    dev = qdev_create(NULL, "xlnx.axi-dma");
> >      qdev_prop_set_uint32(dev, "freqhz", freqhz);
> >      qdev_prop_set_ptr(dev, "dmach", dmach);
> >      qdev_init_nofail(dev);
> > diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c
> > index 59373b5..f4bec37 100644
> > --- a/hw/xilinx_axidma.c
> > +++ b/hw/xilinx_axidma.c
> > @@ -473,7 +473,7 @@ static int xilinx_axidma_init(SysBusDevice *dev)
> >      xlx_dma_connect_dma(s->dmach, s, axidma_push);
> >  
> >      memory_region_init_io(&s->iomem, &axidma_ops, s,
> > -                          "axidma", R_MAX * 4 * 2);
> > +                          "xlnx.axi-dma", R_MAX * 4 * 2);
> >      sysbus_init_mmio(dev, &s->iomem);
> >  
> >      for (i = 0; i < 2; i++) {
> > @@ -502,7 +502,7 @@ static void axidma_class_init(ObjectClass *klass, void *data)
> >  }
> >  
> >  static TypeInfo axidma_info = {
> > -    .name          = "xilinx,axidma",
> > +    .name          = "xlnx.axi-dma",
> >      .parent        = TYPE_SYS_BUS_DEVICE,
> >      .instance_size = sizeof(struct XilinxAXIDMA),
> >      .class_init    = axidma_class_init,
> 
> 
> -- 
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH v2 00/11] Xilinx Devs: refactored device and property names

[Edgar E. Iglesias]

On Wed, Jun 13, 2012 at 02:46:40PM +1000, Peter A. G. Crosthwaite wrote:
> Refactored the device and property names of the Xilinx IP models to match those used by Xilinx in their tools.
> 
> This lays the groundwork for creating Xilinx IP machines from Xilinx generated sources (using -readconfig or -device arguments or dtb driven machine creation) without having to provide a translation layer to change from Xilinx names to QEMU names.
> 

Applied all, thanks Peter.


> Peter A. G. Crosthwaite (11):
>   xilinx_uartlite: changed device name
>   xilinx_timer: added default frequency
>   xilinx_timer: changed nr_timers to one_timer_only
>   xilinx_timer: changed device name
>   xilinx_intc: changed device name
>   xilinx_ethlite: tweaked naming of ping-pong props
>   xilinx_ethlite: changed device name
>   xilinx_axienet: droped the c_ on parameters
>   xilinx_axienet: changed device name
>   xilinx_axidma: (un)reversed irq initialisation
>   xilinx_axidma: changed device name
> 
>  hw/petalogix_ml605_mmu.c      |    2 +-
>  hw/petalogix_s3adsp1800_mmu.c |    4 ++--
>  hw/virtex_ml507.c             |    2 +-
>  hw/xilinx.h                   |   30 +++++++++++++++---------------
>  hw/xilinx_axidma.c            |    6 +++---
>  hw/xilinx_axienet.c           |    6 +++---
>  hw/xilinx_ethlite.c           |    9 +++++----
>  hw/xilinx_intc.c              |    4 ++--
>  hw/xilinx_timer.c             |   23 ++++++++++++++---------
>  hw/xilinx_uartlite.c          |    5 +++--
>  10 files changed, 49 insertions(+), 42 deletions(-)
> 
> -- 
> 1.7.3.2
>