From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bD7Pm-0002vQ-5x for qemu-devel@nongnu.org; Wed, 15 Jun 2016 05:47:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bD7Pd-0001fS-Ip for qemu-devel@nongnu.org; Wed, 15 Jun 2016 05:47:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35018) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bD7Pd-0001eT-E7 for qemu-devel@nongnu.org; Wed, 15 Jun 2016 05:47:05 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8296C3B728 for ; Wed, 15 Jun 2016 09:47:03 +0000 (UTC) From: Gerd Hoffmann Date: Wed, 15 Jun 2016 11:46:56 +0200 Message-Id: <1465984019-28963-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1465984019-28963-1-git-send-email-kraxel@redhat.com> References: <1465984019-28963-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v2 2/5] usb: make USBDevice->attached bool List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Reviewed-by: Markus Armbruster --- 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 16c3461..afd70ea 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 163fe04..8f39470 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]; -- 1.8.3.1