From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>
Subject: [Qemu-devel] [PULL 04/10] usb-mtp: use bool to track MTPObject init status
Date: Mon, 26 May 2014 10:47:01 +0200 [thread overview]
Message-ID: <1401094027-5275-5-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1401094027-5275-1-git-send-email-kraxel@redhat.com>
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 <dgilbert@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
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
next prev parent reply other threads:[~2014-05-26 8:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-26 8:46 [Qemu-devel] [PULL 00/10] usb queue: usb3 streams, xhci + mtp fixes Gerd Hoffmann
2014-05-26 8:46 ` [Qemu-devel] [PULL 01/10] xhci: child detach fix Gerd Hoffmann
2014-05-26 8:46 ` [Qemu-devel] [PULL 02/10] xhci: add endpoint cap on express bus only Gerd Hoffmann
2014-05-26 8:47 ` [Qemu-devel] [PULL 03/10] xhci: add xhci_get_flag Gerd Hoffmann
2014-05-26 8:47 ` Gerd Hoffmann [this message]
2014-05-26 8:47 ` [Qemu-devel] [PULL 05/10] usb-mtp: handle lseek failure Gerd Hoffmann
2014-05-26 8:47 ` [Qemu-devel] [PULL 06/10] usb-mtp: handle usb_mtp_get_object failure Gerd Hoffmann
2014-05-26 8:47 ` [Qemu-devel] [PULL 07/10] usb-redir: Add support for bulk streams Gerd Hoffmann
2014-05-26 8:47 ` [Qemu-devel] [PULL 08/10] usb-host-libusb: Fill in endpoint max_streams when available Gerd Hoffmann
2014-05-26 8:47 ` [Qemu-devel] [PULL 09/10] usb-host-libusb: Add alloc / free streams ops Gerd Hoffmann
2014-05-26 8:47 ` [Qemu-devel] [PULL 10/10] usb-host-libusb: Set stream id when submitting bulk-stream transfers Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401094027-5275-5-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=dgilbert@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).