Re: [Qemu-devel] [PATCH 14/19] dev-hid: convert init to realize

[Paolo Bonzini]

Il 18/09/2014 11:32, address@hidden ha scritto:
> From: Gonglei <address@hidden>
> 
> In this way, all the implementations now use
> error_setg instead of error_report for reporting error.
> 
> Signed-off-by: Gonglei <address@hidden>
> ---
>  hw/usb/dev-hid.c | 23 +++++++++++------------
>  1 file changed, 11 insertions(+), 12 deletions(-)
> 
> diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
> index 67a57f1..7e9d2d6 100644
> --- a/hw/usb/dev-hid.c
> +++ b/hw/usb/dev-hid.c
> @@ -582,7 +582,7 @@ static int usb_hid_initfn(USBDevice *dev, int kind)
>      return 0;

Please change usb_hid_initfn to return void.

>  }
>  
> -static int usb_tablet_initfn(USBDevice *dev)
> +static void usb_tablet_realize(USBDevice *dev, Error **errp)
>  {
>      USBHIDState *us = DO_UPCAST(USBHIDState, dev, dev);
>  
> @@ -594,22 +594,21 @@ static int usb_tablet_initfn(USBDevice *dev)
>          dev->usb_desc = &desc_tablet2;
>          break;
>      default:
> -        error_report("Invalid usb version %d for usb-tabler (must be 1 or 
> 2)",
> -                     us->usb_version);
> -        return -1;
> +        error_setg(errp, "Invalid usb version %d for usb-tablet "
> +                   "(must be 1 or 2)", us->usb_version);

Missing return here.

Paolo

>      }
>  
> -    return usb_hid_initfn(dev, HID_TABLET);
> +    usb_hid_initfn(dev, HID_TABLET);
>  }
>  
> -static int usb_mouse_initfn(USBDevice *dev)
> +static void usb_mouse_realize(USBDevice *dev, Error **errp)
>  {
> -    return usb_hid_initfn(dev, HID_MOUSE);
> +    usb_hid_initfn(dev, HID_MOUSE);
>  }
>  
> -static int usb_keyboard_initfn(USBDevice *dev)
> +static void usb_keyboard_realize(USBDevice *dev, Error **errp)
>  {
> -    return usb_hid_initfn(dev, HID_KEYBOARD);
> +    usb_hid_initfn(dev, HID_KEYBOARD);
>  }
>  
>  static int usb_ptr_post_load(void *opaque, int version_id)
> @@ -669,7 +668,7 @@ static void usb_tablet_class_initfn(ObjectClass *klass, 
> void *data)
>      USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
>  
>      usb_hid_class_initfn(klass, data);
> -    uc->init           = usb_tablet_initfn;
> +    uc->realize           = usb_tablet_realize;
>      uc->product_desc   = "QEMU USB Tablet";
>      dc->vmsd = &vmstate_usb_ptr;
>      dc->props = usb_tablet_properties;
> @@ -689,7 +688,7 @@ static void usb_mouse_class_initfn(ObjectClass *klass, 
> void *data)
>      USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
>  
>      usb_hid_class_initfn(klass, data);
> -    uc->init           = usb_mouse_initfn;
> +    uc->realize           = usb_mouse_realize;
>      uc->product_desc   = "QEMU USB Mouse";
>      uc->usb_desc       = &desc_mouse;
>      dc->vmsd = &vmstate_usb_ptr;
> @@ -714,7 +713,7 @@ static void usb_keyboard_class_initfn(ObjectClass *klass, 
> void *data)
>      USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
>  
>      usb_hid_class_initfn(klass, data);
> -    uc->init           = usb_keyboard_initfn;
> +    uc->realize           = usb_keyboard_realize;
>      uc->product_desc   = "QEMU USB Keyboard";
>      uc->usb_desc       = &desc_keyboard;
>      dc->vmsd = &vmstate_usb_kbd;
>