[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/10] usb-mtp: use bool to track MTPObject init stat
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 04/10] usb-mtp: use bool to track MTPObject init status |
Date: |
Mon, 26 May 2014 10:47:01 +0200 |
Stop setting nchildren to -1. Use separate bool variable to track
whenever we've already fetched the child objects instead.
Also make nchildren unsigned.
Cc: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/dev-mtp.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 943f930..c2750e4 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -109,7 +109,8 @@ struct MTPObject {
struct stat stat;
MTPObject *parent;
MTPObject **children;
- int32_t nchildren;
+ uint32_t nchildren;
+ bool have_children;
QTAILQ_ENTRY(MTPObject) next;
};
@@ -273,7 +274,6 @@ static MTPObject *usb_mtp_object_alloc(MTPState *s,
uint32_t handle,
o->handle = handle;
o->parent = parent;
o->name = g_strdup(name);
- o->nchildren = -1;
if (parent == NULL) {
o->path = g_strdup(name);
} else {
@@ -340,7 +340,11 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject
*o)
struct dirent *entry;
DIR *dir;
- o->nchildren = 0;
+ if (o->have_children) {
+ return;
+ }
+ o->have_children = true;
+
dir = opendir(o->path);
if (!dir) {
return;
@@ -789,9 +793,7 @@ static void usb_mtp_command(MTPState *s, MTPControl *c)
c->trans, 0, 0, 0);
return;
}
- if (o->nchildren == -1) {
- usb_mtp_object_readdir(s, o);
- }
+ usb_mtp_object_readdir(s, o);
if (c->code == CMD_GET_NUM_OBJECTS) {
trace_usb_mtp_op_get_num_objects(s->dev.addr, o->handle, o->path);
nres = 1;
--
1.8.3.1
- [Qemu-devel] [PULL 00/10] usb queue: usb3 streams, xhci + mtp fixes, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 03/10] xhci: add xhci_get_flag, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 01/10] xhci: child detach fix, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 02/10] xhci: add endpoint cap on express bus only, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 04/10] usb-mtp: use bool to track MTPObject init status,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 05/10] usb-mtp: handle lseek failure, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 10/10] usb-host-libusb: Set stream id when submitting bulk-stream transfers, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 07/10] usb-redir: Add support for bulk streams, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 09/10] usb-host-libusb: Add alloc / free streams ops, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 08/10] usb-host-libusb: Fill in endpoint max_streams when available, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 06/10] usb-mtp: handle usb_mtp_get_object failure, Gerd Hoffmann, 2014/05/26
- Re: [Qemu-devel] [PULL 00/10] usb queue: usb3 streams, xhci + mtp fixes, Peter Maydell, 2014/05/28