* [Qemu-devel] [PULL 1/1] usb-mtp: refactor the flow of usb_mtp_write_data
2019-06-07 16:56 [Qemu-devel] [PULL 0/1] Usb 20190607 patches Gerd Hoffmann
@ 2019-06-07 16:56 ` Gerd Hoffmann
2019-06-10 11:55 ` [Qemu-devel] [PULL 0/1] Usb 20190607 patches Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Gerd Hoffmann @ 2019-06-07 16:56 UTC (permalink / raw)
To: qemu-devel; +Cc: Bandan Das, Gerd Hoffmann
From: Bandan Das <bsd@redhat.com>
There's no functional change but the flow is (hopefully)
more consistent for both file and folder object types.
Signed-off-by: Bandan Das <bsd@redhat.com>
Message-Id: <20190401211712.19012-4-bsd@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb/dev-mtp.c | 57 +++++++++++++++++++++++++-----------------------
1 file changed, 30 insertions(+), 27 deletions(-)
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index d90b336d53f4..f31fc76c01ca 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -1599,7 +1599,7 @@ static int usb_mtp_update_object(MTPObject *parent, char *name)
return ret;
}
-static int usb_mtp_write_data(MTPState *s)
+static void usb_mtp_write_data(MTPState *s, uint32_t handle)
{
MTPData *d = s->data_out;
MTPObject *parent =
@@ -1616,26 +1616,33 @@ static int usb_mtp_write_data(MTPState *s)
if (!parent || !s->write_pending) {
usb_mtp_queue_result(s, RES_INVALID_OBJECTINFO, d->trans,
0, 0, 0, 0);
- return 1;
+ return;
}
if (s->dataset.filename) {
path = g_strdup_printf("%s/%s", parent->path, s->dataset.filename);
if (s->dataset.format == FMT_ASSOCIATION) {
ret = mkdir(path, mask);
- goto free;
+ if (!ret) {
+ usb_mtp_queue_result(s, RES_OK, d->trans, 3,
+ QEMU_STORAGE_ID,
+ s->dataset.parent_handle,
+ handle);
+ goto close;
+ }
+ goto done;
}
+
d->fd = open(path, O_CREAT | O_WRONLY |
O_CLOEXEC | O_NOFOLLOW, mask);
if (d->fd == -1) {
- usb_mtp_queue_result(s, RES_STORE_FULL, d->trans,
- 0, 0, 0, 0);
+ ret = 1;
goto done;
}
/* Return success if initiator sent 0 sized data */
if (!s->dataset.size) {
- goto success;
+ goto done;
}
if (d->length != MTP_WRITE_BUF_SZ && !d->pending) {
d->write_status = WRITE_END;
@@ -1647,13 +1654,12 @@ static int usb_mtp_write_data(MTPState *s)
rc = write_retry(d->fd, d->data, d->data_offset,
d->offset - d->data_offset);
if (rc != d->data_offset) {
- usb_mtp_queue_result(s, RES_STORE_FULL, d->trans,
- 0, 0, 0, 0);
+ ret = 1;
goto done;
}
if (d->write_status != WRITE_END) {
g_free(path);
- return ret;
+ return;
} else {
/*
* Return an incomplete transfer if file size doesn't match
@@ -1665,16 +1671,20 @@ static int usb_mtp_write_data(MTPState *s)
usb_mtp_update_object(parent, s->dataset.filename)) {
usb_mtp_queue_result(s, RES_INCOMPLETE_TRANSFER, d->trans,
0, 0, 0, 0);
- goto done;
+ goto close;
}
}
}
-success:
- usb_mtp_queue_result(s, RES_OK, d->trans,
- 0, 0, 0, 0);
-
done:
+ if (ret) {
+ usb_mtp_queue_result(s, RES_STORE_FULL, d->trans,
+ 0, 0, 0, 0);
+ } else {
+ usb_mtp_queue_result(s, RES_OK, d->trans,
+ 0, 0, 0, 0);
+ }
+close:
/*
* The write dataset is kept around and freed only
* on success or if another write request comes in
@@ -1683,12 +1693,10 @@ done:
close(d->fd);
d->fd = -1;
}
-free:
g_free(s->dataset.filename);
s->dataset.size = 0;
g_free(path);
s->write_pending = false;
- return ret;
}
static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen)
@@ -1732,16 +1740,11 @@ static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen)
s->write_pending = true;
if (s->dataset.format == FMT_ASSOCIATION) {
- if (usb_mtp_write_data(s)) {
- /* next_handle will be allocated to the newly created dir */
- usb_mtp_queue_result(s, RES_STORE_FULL, d->trans,
- 0, 0, 0, 0);
- return;
- }
+ usb_mtp_write_data(s, next_handle);
+ } else {
+ usb_mtp_queue_result(s, RES_OK, d->trans, 3, QEMU_STORAGE_ID,
+ s->dataset.parent_handle, next_handle);
}
-
- usb_mtp_queue_result(s, RES_OK, d->trans, 3, QEMU_STORAGE_ID,
- s->dataset.parent_handle, next_handle);
}
static void usb_mtp_get_data(MTPState *s, mtp_container *container,
@@ -1821,14 +1824,14 @@ static void usb_mtp_get_data(MTPState *s, mtp_container *container,
} else {
d->write_status = WRITE_START;
}
- usb_mtp_write_data(s);
+ usb_mtp_write_data(s, 0);
usb_mtp_data_free(s->data_out);
s->data_out = NULL;
return;
}
if (d->data_offset == d->length) {
d->pending = true;
- usb_mtp_write_data(s);
+ usb_mtp_write_data(s, 0);
}
break;
default:
--
2.18.1
^ permalink raw reply related [flat|nested] 3+ messages in thread