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

[Andreas Färber]

Am 04.01.2013 22:29, schrieb Hervé Poussineau:
> Signed-off-by: Hervé Poussineau <address@hidden>
> ---
>  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

Is there some kind of guidance in which cases to use .impl vs. .valid
for the access sizes in these conversions?

Andreas

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