Commit c4fe9700 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Gerd Hoffmann
Browse files

usb: replace handle_destroy with unrealize 



Curiously, unrealize() is not being used, but it seems more
appropriate than handle_destroy() together with realize(). It is more
ubiquitous destroy name in qemu code base and may throw errors.

Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20170221141451.28305-25-marcandre.lureau@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 796b288f

hw/usb/bus.c

+5 −4
Original line number Diff line number Diff line
@@ -136,11 +136,12 @@ USBDevice *usb_device_find_device(USBDevice *dev, uint8_t addr) 
    return NULL;

}



static void usb_device_handle_destroy(USBDevice *dev)

static void usb_device_unrealize(USBDevice *dev, Error **errp)

{

    USBDeviceClass *klass = USB_DEVICE_GET_CLASS(dev);

    if (klass->handle_destroy) {

        klass->handle_destroy(dev);



    if (klass->unrealize) {

        klass->unrealize(dev, errp);

    }

}
@@ -291,7 +292,7 @@ static void usb_qdev_unrealize(DeviceState *qdev, Error **errp) 
    if (dev->attached) {

        usb_device_detach(dev);

    }

    usb_device_handle_destroy(dev);

    usb_device_unrealize(dev, errp);

    if (dev->port) {

        usb_release_port(dev);

    }

hw/usb/dev-audio.c

+2 −2
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ static void usb_audio_handle_data(USBDevice *dev, USBPacket *p) 
    }

}



static void usb_audio_handle_destroy(USBDevice *dev)

static void usb_audio_unrealize(USBDevice *dev, Error **errp)

{

    USBAudioState *s = USB_AUDIO(dev);
@@ -683,7 +683,7 @@ static void usb_audio_class_init(ObjectClass *klass, void *data) 
    k->handle_reset   = usb_audio_handle_reset;

    k->handle_control = usb_audio_handle_control;

    k->handle_data    = usb_audio_handle_data;

    k->handle_destroy = usb_audio_handle_destroy;

    k->unrealize      = usb_audio_unrealize;

    k->set_interface  = usb_audio_set_interface;

}

hw/usb/dev-bluetooth.c

+2 −2
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ static void usb_bt_out_hci_packet_acl(void *opaque, 
    usb_bt_fifo_enqueue(&s->acl, data, len);

}



static void usb_bt_handle_destroy(USBDevice *dev)

static void usb_bt_unrealize(USBDevice *dev, Error **errp)

{

    struct USBBtState *s = (struct USBBtState *) dev->opaque;
@@ -559,7 +559,7 @@ static void usb_bt_class_initfn(ObjectClass *klass, void *data) 
    uc->handle_reset   = usb_bt_handle_reset;

    uc->handle_control = usb_bt_handle_control;

    uc->handle_data    = usb_bt_handle_data;

    uc->handle_destroy = usb_bt_handle_destroy;

    uc->unrealize      = usb_bt_unrealize;

    dc->vmsd = &vmstate_usb_bt;

    set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);

}

hw/usb/dev-hid.c

+2 −2
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ static void usb_hid_handle_data(USBDevice *dev, USBPacket *p) 
    }

}



static void usb_hid_handle_destroy(USBDevice *dev)

static void usb_hid_unrealize(USBDevice *dev, Error **errp)

{

    USBHIDState *us = USB_HID(dev);
@@ -785,7 +785,7 @@ static void usb_hid_class_initfn(ObjectClass *klass, void *data) 
    uc->handle_reset   = usb_hid_handle_reset;

    uc->handle_control = usb_hid_handle_control;

    uc->handle_data    = usb_hid_handle_data;

    uc->handle_destroy = usb_hid_handle_destroy;

    uc->unrealize      = usb_hid_unrealize;

    uc->handle_attach  = usb_desc_attach;

}

hw/usb/dev-hub.c

+2 −2
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static void usb_hub_handle_data(USBDevice *dev, USBPacket *p) 
    }

}



static void usb_hub_handle_destroy(USBDevice *dev)

static void usb_hub_unrealize(USBDevice *dev, Error **errp)

{

    USBHubState *s = (USBHubState *)dev;

    int i;
@@ -575,7 +575,7 @@ static void usb_hub_class_initfn(ObjectClass *klass, void *data) 
    uc->handle_reset   = usb_hub_handle_reset;

    uc->handle_control = usb_hub_handle_control;

    uc->handle_data    = usb_hub_handle_data;

    uc->handle_destroy = usb_hub_handle_destroy;

    uc->unrealize      = usb_hub_unrealize;

    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);

    dc->fw_name = "hub";

    dc->vmsd = &vmstate_usb_hub;