Re: [Qemu-devel] [PULL 18/19] usb: usb-serial QOMify

[Samuel Thibault]

Gerd Hoffmann, le Fri 08 May 2015 13:45:52 +0200, a écrit :
> From: Gonglei <address@hidden>
> 
> Signed-off-by: Gonglei <address@hidden>
> Signed-off-by: Gerd Hoffmann <address@hidden>

Acked-by: Samuel Thibault <address@hidden>
Tested-by: Samuel Thibault <address@hidden>

> ---
>  hw/usb/dev-serial.c | 43 +++++++++++++++++++++++++++----------------
>  1 file changed, 27 insertions(+), 16 deletions(-)
> 
> diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
> index 67c2072..6ca3da9 100644
> --- a/hw/usb/dev-serial.c
> +++ b/hw/usb/dev-serial.c
> @@ -103,6 +103,9 @@ typedef struct {
>      CharDriverState *cs;
>  } USBSerialState;
>  
> +#define TYPE_USB_SERIAL "usb-serial-dev"
> +#define USB_SERIAL_DEV(obj) OBJECT_CHECK(USBSerialState, (obj), 
> TYPE_USB_SERIAL)
> +
>  enum {
>      STR_MANUFACTURER = 1,
>      STR_PRODUCT_SERIAL,
> @@ -473,7 +476,7 @@ static void usb_serial_event(void *opaque, int event)
>  
>  static void usb_serial_realize(USBDevice *dev, Error **errp)
>  {
> -    USBSerialState *s = DO_UPCAST(USBSerialState, dev, dev);
> +    USBSerialState *s = USB_SERIAL_DEV(dev);
>      Error *local_err = NULL;
>  
>      usb_desc_create_serial(dev);
> @@ -576,26 +579,40 @@ static Property serial_properties[] = {
>      DEFINE_PROP_END_OF_LIST(),
>  };
>  
> -static void usb_serial_class_initfn(ObjectClass *klass, void *data)
> +static void usb_serial_dev_class_init(ObjectClass *klass, void *data)
>  {
>      DeviceClass *dc = DEVICE_CLASS(klass);
>      USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
>  
> -    uc->realize = usb_serial_realize;
> -    uc->product_desc   = "QEMU USB Serial";
> -    uc->usb_desc       = &desc_serial;
> +    uc->realize        = usb_serial_realize;
>      uc->handle_reset   = usb_serial_handle_reset;
>      uc->handle_control = usb_serial_handle_control;
>      uc->handle_data    = usb_serial_handle_data;
>      dc->vmsd = &vmstate_usb_serial;
> -    dc->props = serial_properties;
>      set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
>  }
>  
> +static const TypeInfo usb_serial_dev_type_info = {
> +    .name = TYPE_USB_SERIAL,
> +    .parent = TYPE_USB_DEVICE,
> +    .instance_size = sizeof(USBSerialState),
> +    .abstract = true,
> +    .class_init = usb_serial_dev_class_init,
> +};
> +
> +static void usb_serial_class_initfn(ObjectClass *klass, void *data)
> +{
> +    DeviceClass *dc = DEVICE_CLASS(klass);
> +    USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
> +
> +    uc->product_desc   = "QEMU USB Serial";
> +    uc->usb_desc       = &desc_serial;
> +    dc->props = serial_properties;
> +}
> +
>  static const TypeInfo serial_info = {
>      .name          = "usb-serial",
> -    .parent        = TYPE_USB_DEVICE,
> -    .instance_size = sizeof(USBSerialState),
> +    .parent        = TYPE_USB_SERIAL,
>      .class_init    = usb_serial_class_initfn,
>  };
>  
> @@ -609,26 +626,20 @@ static void usb_braille_class_initfn(ObjectClass 
> *klass, void *data)
>      DeviceClass *dc = DEVICE_CLASS(klass);
>      USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
>  
> -    uc->realize        = usb_serial_realize;
>      uc->product_desc   = "QEMU USB Braille";
>      uc->usb_desc       = &desc_braille;
> -    uc->handle_reset   = usb_serial_handle_reset;
> -    uc->handle_control = usb_serial_handle_control;
> -    uc->handle_data    = usb_serial_handle_data;
> -    dc->vmsd = &vmstate_usb_serial;
>      dc->props = braille_properties;
> -    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
>  }
>  
>  static const TypeInfo braille_info = {
>      .name          = "usb-braille",
> -    .parent        = TYPE_USB_DEVICE,
> -    .instance_size = sizeof(USBSerialState),
> +    .parent        = TYPE_USB_SERIAL,
>      .class_init    = usb_braille_class_initfn,
>  };
>  
>  static void usb_serial_register_types(void)
>  {
> +    type_register_static(&usb_serial_dev_type_info);
>      type_register_static(&serial_info);
>      usb_legacy_register("usb-serial", "serial", usb_serial_init);
>      type_register_static(&braille_info);
> -- 
> 1.8.3.1
> 

-- 
Samuel
 tohi.cybercable.fr (212.198.0.3) si une personne se reconnait derriere
 cette adresse que ce soit un pirate ou une victime qu'il se manifeste,
 cette personne pourrait bien etre un petit malin
 -+- Fred in NPC : Mamaaaaan, y a le routeur qui veut me hacker -+-