From patchwork Tue Jan 26 10:41:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 8120151 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DD6669F818 for ; Tue, 26 Jan 2016 10:46:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5636920166 for ; Tue, 26 Jan 2016 10:46:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A69272025B for ; Tue, 26 Jan 2016 10:45:59 +0000 (UTC) Received: from localhost ([::1]:42983 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO18J-0001tP-3s for patchwork-qemu-devel@patchwork.kernel.org; Tue, 26 Jan 2016 05:45:59 -0500 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) Received: from nilsson.home.kraxel.org (ovpn-116-40.ams2.redhat.com [10.36.116.40]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0QAfYkI008907; Tue, 26 Jan 2016 05:41:35 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 057D780C03; Tue, 26 Jan 2016 11:41:34 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Markus Armbruster , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 1/4] usb: make USBDevice->attached bool X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 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];