Commit eb19d2b9 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

usb: make USBDevice->attached bool 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-id: 1465984019-28963-3-git-send-email-kraxel@redhat.com
parent 8d3830ef

hw/usb/bus.c

+4 −4
Original line number Diff line number Diff line
@@ -55,9 +55,9 @@ static int usb_device_post_load(void *opaque, int version_id) 
    USBDevice *dev = opaque;



    if (dev->state == USB_STATE_NOTATTACHED) {

        dev->attached = 0;

        dev->attached = false;

    } else {

        dev->attached = 1;

        dev->attached = true;

    }

    if (dev->setup_index < 0 ||

        dev->setup_len < 0 ||
@@ -533,7 +533,7 @@ void usb_device_attach(USBDevice *dev, Error **errp) 
        return;

    }



    dev->attached++;

    dev->attached = true;

    usb_attach(port);

}
@@ -547,7 +547,7 @@ int usb_device_detach(USBDevice *dev) 
    trace_usb_port_detach(bus->busnr, port->path);



    usb_detach(port);

    dev->attached--;

    dev->attached = false;

    return 0;

}

include/hw/usb.h

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ struct USBDevice { 
    uint8_t addr;

    char product_desc[32];

    int auto_attach;

    int attached;

    bool attached;



    int32_t state;

    uint8_t setup_buf[8];