| Message ID | 1340857920-23763-1-git-send-email-peter.crosthwaite@petalogix.com |
|---|---|
| State | New |
| Headers | show |
Hi Edgar, I think for little ones like this, ill start a microblaze-devs patch queue and periodically send pull requests. Ill send the patches singly to qemu-devel for ACK and NACK as I create them, then [PULL] every couple of weeks to consolidate our testing/rebasing efforts. Sound like a plan? Regards, Peter On Thu, Jun 28, 2012 at 2:32 PM, Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> wrote: > Fixes an error in a61e4b07a30c062260d2d01771773f14820d1eb7 > > 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 7df21eb..c4d9d19 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, "xlnx,xps-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 b562bd0..053ba02 100644 > --- a/hw/xilinx_timer.c > +++ b/hw/xilinx_timer.c > @@ -217,7 +217,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, "xlnx,xps-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; > @@ -239,7 +239,7 @@ static void xilinx_timer_class_init(ObjectClass *klass, void *data) > } > > static TypeInfo xilinx_timer_info = { > - .name = "xlnx,xps-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 >
On Fri, Jun 29, 2012 at 01:31:01PM +1000, Peter Crosthwaite wrote: > Hi Edgar, > > I think for little ones like this, ill start a microblaze-devs patch > queue and periodically send pull requests. Ill send the patches singly > to qemu-devel for ACK and NACK as I create them, then [PULL] every > couple of weeks to consolidate our testing/rebasing efforts. Sound > like a plan? Sounds good Peter, Thanks.
diff --git a/hw/xilinx.h b/hw/xilinx.h index 7df21eb..c4d9d19 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, "xlnx,xps-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 b562bd0..053ba02 100644 --- a/hw/xilinx_timer.c +++ b/hw/xilinx_timer.c @@ -217,7 +217,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, "xlnx,xps-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; @@ -239,7 +239,7 @@ static void xilinx_timer_class_init(ObjectClass *klass, void *data) } static TypeInfo xilinx_timer_info = { - .name = "xlnx,xps-timer", + .name = "xlnx.xps-timer", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(struct timerblock), .class_init = xilinx_timer_class_init,
Fixes an error in a61e4b07a30c062260d2d01771773f14820d1eb7 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(-)