From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO149-0001mD-9z for qemu-devel@nongnu.org; Tue, 26 Jan 2016 05:41:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO144-0007mV-DC for qemu-devel@nongnu.org; Tue, 26 Jan 2016 05:41:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32830) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO144-0007mE-7P for qemu-devel@nongnu.org; Tue, 26 Jan 2016 05:41:36 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 81ECD8F4E1 for ; Tue, 26 Jan 2016 10:41:35 +0000 (UTC) From: Gerd Hoffmann Date: Tue, 26 Jan 2016 11:41:22 +0100 Message-Id: <1453804885-15544-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1453804885-15544-1-git-send-email-kraxel@redhat.com> References: <1453804885-15544-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] usb: make USBDevice->attached bool List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- 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 1bbe930..dd28041 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -52,9 +52,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 || @@ -530,7 +530,7 @@ void usb_device_attach(USBDevice *dev, Error **errp) return; } - dev->attached++; + dev->attached = true; usb_attach(port); } @@ -544,7 +544,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 c8b6e7b..f8432f9 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -234,7 +234,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