mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb-mtp: refactor the flow of usb_mtp_write_data

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJc+pc/AAoJEEy22O7T6HE4GQwQALLNFR9qVllL11GHQvaDh8ut
 ti71dt4a6YfRjQFFl3rq6Obw3FnuwsOwXHbCg1sI45TNa65RaLcdkMoWl5GL0Xa/
 UR7vsyuLQd4VceUsX3NmYiT4kWesWhipXW4OwT+7R4uKo+3aZZdIo+qwCCM5CoXZ
 11Nw4hZ0LtOywPRVcNb9/UqlASVI1mOemeux1Dbgdq3jN5Cv/ktKPgksYbsghBZf
 kuYzrNyH+TPv2dEVtovOcLd00apFnjrObiJRzIH7EssCRo1W0leQPKO3HvZe5KIi
 5QZbnmpi/x0Q3ojBkN90uSHBGhUtK2YxIERWARoqvgemlIfkOu8pEalPAkchd8m+
 BzaXFhRcu1FZW824uf9fm5ue3PrrfrMH1txYUGTT4xz0ap0p220xUDBzW58Ey/zT
 j00WpN4U6qU+958bBa2GCtgBl7xnkgn9bAa/9S1ukYjTaE00uDyOrlgASt8ycHrM
 cnf0dkJHU51Q63dgtusz5iYDv0ZdMRGI+83+WxVvjmsVAOsY2BiQMD8NzPILfXu7
 SDb4VhgwfVB0iBtODsGPyhN20asWS770YR61Uq2HkYi6hyDvLUgpDtRLKft3VwEz
 yexFxQtM80/OKQK2K+xnxm2MvEuUVXg6u7WSoYjUOOwviozAWfIj9TikA3alERVo
 Neza+GKXANoQx27B58vi
 =1AwB
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/kraxel/tags/usb-20190607-pull-request' into staging

usb-mtp: refactor the flow of usb_mtp_write_data

# gpg: Signature made Fri 07 Jun 2019 17:56:31 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/usb-20190607-pull-request:
  usb-mtp: refactor the flow of usb_mtp_write_data

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2019-06-10 11:53:19 +01:00
commit 19735c837a
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
hw/usb/dev-mtp.c
View File

@ -1599,7 +1599,7 @@ static int usb_mtp_update_object(MTPObject *parent, char *name)
return ret; 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; MTPData *d = s->data_out;
MTPObject *parent = MTPObject *parent =
@ -1616,26 +1616,33 @@ static int usb_mtp_write_data(MTPState *s)
if (!parent || !s->write_pending) { if (!parent || !s->write_pending) {
usb_mtp_queue_result(s, RES_INVALID_OBJECTINFO, d->trans, usb_mtp_queue_result(s, RES_INVALID_OBJECTINFO, d->trans,
0, 0, 0, 0); 0, 0, 0, 0);
return 1; return;
} }
if (s->dataset.filename) { if (s->dataset.filename) {
path = g_strdup_printf("%s/%s", parent->path, s->dataset.filename); path = g_strdup_printf("%s/%s", parent->path, s->dataset.filename);
if (s->dataset.format == FMT_ASSOCIATION) { if (s->dataset.format == FMT_ASSOCIATION) {
ret = mkdir(path, mask); 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 | d->fd = open(path, O_CREAT | O_WRONLY |
O_CLOEXEC | O_NOFOLLOW, mask); O_CLOEXEC | O_NOFOLLOW, mask);
if (d->fd == -1) { if (d->fd == -1) {
usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, ret = 1;
0, 0, 0, 0);
goto done; goto done;
} }
/* Return success if initiator sent 0 sized data */ /* Return success if initiator sent 0 sized data */
if (!s->dataset.size) { if (!s->dataset.size) {
goto success; goto done;
} }
if (d->length != MTP_WRITE_BUF_SZ && !d->pending) { if (d->length != MTP_WRITE_BUF_SZ && !d->pending) {
d->write_status = WRITE_END; 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, rc = write_retry(d->fd, d->data, d->data_offset,
d->offset - d->data_offset); d->offset - d->data_offset);
if (rc != d->data_offset) { if (rc != d->data_offset) {
usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, ret = 1;
0, 0, 0, 0);
goto done; goto done;
} }
if (d->write_status != WRITE_END) { if (d->write_status != WRITE_END) {
g_free(path); g_free(path);
return ret; return;
} else { } else {
/* /*
* Return an incomplete transfer if file size doesn't match * 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_update_object(parent, s->dataset.filename)) {
usb_mtp_queue_result(s, RES_INCOMPLETE_TRANSFER, d->trans, usb_mtp_queue_result(s, RES_INCOMPLETE_TRANSFER, d->trans,
0, 0, 0, 0); 0, 0, 0, 0);
goto done; goto close;
} }
} }
} }
success:
usb_mtp_queue_result(s, RES_OK, d->trans,
0, 0, 0, 0);
done: 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 * The write dataset is kept around and freed only
* on success or if another write request comes in * on success or if another write request comes in
@ -1683,12 +1693,10 @@ done:
close(d->fd); close(d->fd);
d->fd = -1; d->fd = -1;
} }
free:
g_free(s->dataset.filename); g_free(s->dataset.filename);
s->dataset.size = 0; s->dataset.size = 0;
g_free(path); g_free(path);
s->write_pending = false; s->write_pending = false;
return ret;
} }
static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen) 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; s->write_pending = true;
if (s->dataset.format == FMT_ASSOCIATION) { if (s->dataset.format == FMT_ASSOCIATION) {
if (usb_mtp_write_data(s)) { usb_mtp_write_data(s, next_handle);
/* next_handle will be allocated to the newly created dir */ } else {
usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, usb_mtp_queue_result(s, RES_OK, d->trans, 3, QEMU_STORAGE_ID,
0, 0, 0, 0); s->dataset.parent_handle, next_handle);
return;
}
} }
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, 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 { } else {
d->write_status = WRITE_START; d->write_status = WRITE_START;
} }
usb_mtp_write_data(s); usb_mtp_write_data(s, 0);
usb_mtp_data_free(s->data_out); usb_mtp_data_free(s->data_out);
s->data_out = NULL; s->data_out = NULL;
return; return;
} }
if (d->data_offset == d->length) { if (d->data_offset == d->length) {
d->pending = true; d->pending = true;
usb_mtp_write_data(s); usb_mtp_write_data(s, 0);
} }
break; break;
default: default: