[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/5] usb: make USBDevice->attached bool
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 2/5] usb: make USBDevice->attached bool |
Date: |
Wed, 22 Jun 2016 13:48:44 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
---
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
- [Qemu-devel] [PULL 0/5] usb: add hotplug support for usb-bot and usb-uas., Gerd Hoffmann, 2016/06/22
- [Qemu-devel] [PULL 1/5] usb-storage: qcow2 encryption support is finally gone, zap dead code, Gerd Hoffmann, 2016/06/22
- [Qemu-devel] [PULL 5/5] usb-uas: hotplug support, Gerd Hoffmann, 2016/06/22
- [Qemu-devel] [PULL 4/5] usb-bot: hotplug support, Gerd Hoffmann, 2016/06/22
- [Qemu-devel] [PULL 2/5] usb: make USBDevice->attached bool,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 3/5] usb: Add QOM property "attached"., Gerd Hoffmann, 2016/06/22
- Re: [Qemu-devel] [PULL 0/5] usb: add hotplug support for usb-bot and usb-uas., Peter Maydell, 2016/06/23