From eb19d2b9d15bf68d27704e8727772924681644b8 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 15 Jun 2016 11:46:56 +0200 Subject: [PATCH] usb: make USBDevice->attached bool Signed-off-by: Gerd Hoffmann Reviewed-by: Markus Armbruster Message-id: 1465984019-28963-3-git-send-email-kraxel@redhat.com --- hw/usb/bus.c | 8 ++++---- include/hw/usb.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 16c3461d99..afd70ea599 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -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; } diff --git a/include/hw/usb.h b/include/hw/usb.h index 163fe0490b..8f3947069e 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -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]; -- 2.11.4.GIT