Re: [Xen-devel] [Qemu-devel] [PATCH 05/10] xen_platform: do not use old_portio-style callbacks

[Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>]

On Tue, 15 Jan 2013, Andreas FÃrber wrote:
> Stefano,
> 
> Am 12.01.2013 17:06, schrieb Andreas FÃrber:
> > Am 04.01.2013 22:29, schrieb Hervà Poussineau:
> >> Signed-off-by: Hervà Poussineau <hpoussin@xxxxxxxxxxx>
> >> ---
> >>  hw/xen_platform.c |   21 ++++++++++-----------
> >>  1 file changed, 10 insertions(+), 11 deletions(-)
> >>
> >> diff --git a/hw/xen_platform.c b/hw/xen_platform.c
> >> index e7611bb..02e0146 100644
> >> --- a/hw/xen_platform.c
> >> +++ b/hw/xen_platform.c
> >> @@ -279,7 +279,8 @@ static void 
> >> platform_fixed_ioport_init(PCIXenPlatformState* s)
> >>  
> >>  /* Xen Platform PCI Device */
> >>  
> >> -static uint32_t xen_platform_ioport_readb(void *opaque, uint32_t addr)
> >> +static uint64_t xen_platform_ioport_readb(void *opaque, hwaddr addr,
> >> +                                          unsigned int size)
> >>  {
> >>      if (addr == 0) {
> >>          return platform_fixed_ioport_readb(opaque, 0);
> >> @@ -288,30 +289,28 @@ static uint32_t xen_platform_ioport_readb(void 
> >> *opaque, uint32_t addr)
> >>      }
> >>  }
> >>  
> >> -static void xen_platform_ioport_writeb(void *opaque, uint32_t addr, 
> >> uint32_t val)
> >> +static void xen_platform_ioport_writeb(void *opaque, hwaddr addr,
> >> +                                       uint64_t val, unsigned int size)
> >>  {
> >>      PCIXenPlatformState *s = opaque;
> >>  
> >>      switch (addr) {
> >>      case 0: /* Platform flags */
> >> -        platform_fixed_ioport_writeb(opaque, 0, val);
> >> +        platform_fixed_ioport_writeb(opaque, 0, (uint32_t)val);
> >>          break;
> >>      case 8:
> >> -        log_writeb(s, val);
> >> +        log_writeb(s, (uint32_t)val);
> >>          break;
> >>      default:
> >>          break;
> >>      }
> >>  }
> >>  
> >> -static MemoryRegionPortio xen_pci_portio[] = {
> >> -    { 0, 0x100, 1, .read = xen_platform_ioport_readb, },
> >> -    { 0, 0x100, 1, .write = xen_platform_ioport_writeb, },
> >> -    PORTIO_END_OF_LIST()
> >> -};
> >> -
> >>  static const MemoryRegionOps xen_pci_io_ops = {
> >> -    .old_portio = xen_pci_portio,
> >> +    .read  = xen_platform_ioport_readb,
> >> +    .write = xen_platform_ioport_writeb,
> >> +    .impl.min_access_size = 1,
> >> +    .impl.max_access_size = 1,
> >>  };
> >>  
> >>  static void platform_ioport_bar_setup(PCIXenPlatformState *d)
> > 
> > Thanks, applied to memory-ioport queue:
> > https://github.com/afaerber/qemu-cpu/commits/memory-ioport
> 
> If you want to ack or object, now would be the time. :)
> https://github.com/afaerber/qemu-cpu/commit/016861a22283da3931c4b343e6d2df0dc123b6ef

That patch is also fine by me. Thanks for the heads up!

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel