[Qemu-devel] Re: [PATCH 4/5] uhci: rewrite UHCI emulator, fully async operation with multiple outstanding transactions

[Anthony Liguori]

Max Krasnyansky wrote:
>  
> +static UHCIAsync *uhci_async_alloc(UHCIState *s)
> +{
> +    UHCIAsync *async = qemu_malloc(sizeof(UHCIAsync));
> +    if (async) {
> +        memset(&async->packet, 0, sizeof(async->packet));
>   

You can use qemu_mallocz() here.

>  static void uhci_attach(USBPort *port1, USBDevice *dev);
>  
>  static void uhci_update_irq(UHCIState *s)
> @@ -143,15 +320,18 @@ static void uhci_reset(UHCIState *s)
>      s->intr = 0;
>      s->fl_base_addr = 0;
>      s->sof_timing = 64;
> +
>      for(i = 0; i < NB_PORTS; i++) {
>          port = &s->ports[i];
>          port->ctrl = 0x0080;
>          if (port->port.dev)
>              uhci_attach(&port->port, port->port.dev);
>      }
> +
> +    uhci_async_cancel_all(s);
>  }
>  
> -#if 0
> +#if 1
>   

Just drop the #if

>  static void uhci_save(QEMUFile *f, void *opaque)
>  {
>      UHCIState *s = opaque;
> @@ -239,9 +419,8 @@ static void uhci_ioport_writew(void *opaque, uint32_t addr, 
> uint32_t val)
>      UHCIState *s = opaque;
>  
>      addr &= 0x1f;
> -#ifdef DEBUG
> -    printf("uhci writew port=0x%04x val=0x%04x\n", addr, val);
> -#endif
> +    dprintf("uhci: writew port=0x%04x val=0x%04x\n", addr, val);
> +
>      switch(addr) {
>      case 0x00:
>          if ((val & UHCI_CMD_RS) && !(s->cmd & UHCI_CMD_RS)) {
> @@ -350,9 +529,9 @@ static uint32_t uhci_ioport_readw(void *opaque, uint32_t 
> addr)
>          val = 0xff7f; /* disabled port */
>          break;
>      }
> -#ifdef DEBUG
> -    printf("uhci readw port=0x%04x val=0x%04x\n", addr, val);
> -#endif
> +
> +    dprintf("uhci: readw port=0x%04x val=0x%04x\n", addr, val);
> +
>      return val;
>  }

How do you handle the outstanding asynchronous requests in save/restore?

Regards,

Anthony Liguori