Commit e6adae52 authored by Gonglei's avatar Gonglei Committed by Gerd Hoffmann
Browse files

host-libusb: remove bootindex property from qdev to qom 



Remove bootindex form qdev property to qom, things will
continue to work just fine, and we can use qom features
which are not supported by qdev property.

Signed-off-by: default avatarGonglei <arei.gonglei@huawei.com>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 0cf63c3e

hw/usb/host-libusb.c

+11 −1
Original line number Diff line number Diff line
@@ -982,6 +982,16 @@ static void usb_host_realize(USBDevice *udev, Error **errp) 
    usb_host_auto_check(NULL);

}



static void usb_host_instance_init(Object *obj)

{

    USBDevice *udev = USB_DEVICE(obj);

    USBHostDevice *s = USB_HOST_DEVICE(udev);



    device_add_bootindex_property(obj, &s->bootindex,

                                  "bootindex", NULL,

                                  &udev->qdev, NULL);

}



static void usb_host_handle_destroy(USBDevice *udev)

{

    USBHostDevice *s = USB_HOST_DEVICE(udev);
@@ -1465,7 +1475,6 @@ static Property usb_host_dev_properties[] = { 
    DEFINE_PROP_UINT32("productid", USBHostDevice, match.product_id, 0),

    DEFINE_PROP_UINT32("isobufs",  USBHostDevice, iso_urb_count,    4),

    DEFINE_PROP_UINT32("isobsize", USBHostDevice, iso_urb_frames,   32),

    DEFINE_PROP_INT32("bootindex", USBHostDevice, bootindex,        -1),

    DEFINE_PROP_UINT32("loglevel",  USBHostDevice, loglevel,

                       LIBUSB_LOG_LEVEL_WARNING),

    DEFINE_PROP_BIT("pipeline",    USBHostDevice, options,
@@ -1498,6 +1507,7 @@ static TypeInfo usb_host_dev_info = { 
    .parent        = TYPE_USB_DEVICE,

    .instance_size = sizeof(USBHostDevice),

    .class_init    = usb_host_class_initfn,

    .instance_init = usb_host_instance_init,

};



static void usb_host_register_types(void)