motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 10:34:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests/9p: merge v9fs_tmkdir() and do_mkdir()

Browse source 
As with previous patches, unify those 2 functions into a single function
v9fs_tmkdir() by using a declarative function arguments approach.

Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Message-Id: <b87b2c972921df980440ff5b2d3e6bb8163d6551.1664917004.git.qemu_oss@crudebyte.com>
This commit is contained in:
Christian Schoenebeck 2022-10-04 22:54:06 +02:00
parent d89146fd16
commit e11680102a
3 changed files with 78 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

42
tests/qtest/libqos/virtio-9p-client.c
View file

@ -766,10 +766,26 @@ void v9fs_rflush(P9Req *req)
}
/* size[4] Tmkdir tag[2] dfid[4] name[s] mode[4] gid[4] */
P9Req *v9fs_tmkdir(QVirtio9P *v9p, uint32_t dfid, const char *name,
uint32_t mode, uint32_t gid, uint16_t tag)
TMkdirRes v9fs_tmkdir(TMkdirOpt opt)
{
P9Req *req;
uint32_t err;
g_autofree char *name = g_strdup(opt.name);
g_assert(opt.client);
/* expecting either hi-level atPath or low-level dfid, but not both */
g_assert(!opt.atPath || !opt.dfid);
/* expecting either Rmkdir or Rlerror, but obviously not both */
g_assert(!opt.expectErr || !opt.rmkdir.qid);
if (opt.atPath) {
opt.dfid = v9fs_twalk((TWalkOpt) { .client = opt.client,
.path = opt.atPath }).newfid;
}
if (!opt.mode) {
opt.mode = 0750;
}
uint32_t body_size = 4 + 4 + 4;
uint16_t string_size = v9fs_string_size(name);
@ -777,13 +793,25 @@ P9Req *v9fs_tmkdir(QVirtio9P *v9p, uint32_t dfid, const char *name,
g_assert_cmpint(body_size, <=, UINT32_MAX - string_size);
body_size += string_size;
req = v9fs_req_init(v9p, body_size, P9_TMKDIR, tag);
v9fs_uint32_write(req, dfid);
req = v9fs_req_init(opt.client, body_size, P9_TMKDIR, opt.tag);
v9fs_uint32_write(req, opt.dfid);
v9fs_string_write(req, name);
v9fs_uint32_write(req, mode);
v9fs_uint32_write(req, gid);
v9fs_uint32_write(req, opt.mode);
v9fs_uint32_write(req, opt.gid);
v9fs_req_send(req);
return req;
if (!opt.requestOnly) {
v9fs_req_wait_for_reply(req, NULL);
if (opt.expectErr) {
v9fs_rlerror(req, &err);
g_assert_cmpint(err, ==, opt.expectErr);
} else {
v9fs_rmkdir(req, opt.rmkdir.qid);
}
req = NULL; /* request was freed */
}
return (TMkdirRes) { .req = req };
}
/* size[4] Rmkdir tag[2] qid[13] */

36
tests/qtest/libqos/virtio-9p-client.h
View file

@ -287,6 +287,39 @@ typedef struct TFlushRes {
P9Req *req;
} TFlushRes;
/* options for 'Tmkdir' 9p request */
typedef struct TMkdirOpt {
/* 9P client being used (mandatory) */
QVirtio9P *client;
/* user supplied tag number being returned with response (optional) */
uint16_t tag;
/* low level variant of directory where new one shall be created */
uint32_t dfid;
/* high-level variant of directory where new one shall be created */
const char *atPath;
/* New directory's name (required) */
const char *name;
/* Linux mkdir(2) mode bits (optional) */
uint32_t mode;
/* effective group ID of caller */
uint32_t gid;
/* data being received from 9p server as 'Rmkdir' response (optional) */
struct {
/* QID of newly created directory */
v9fs_qid *qid;
} rmkdir;
/* only send Tmkdir request but not wait for a reply? (optional) */
bool requestOnly;
/* do we expect an Rlerror response, if yes which error code? (optional) */
uint32_t expectErr;
} TMkdirOpt;
/* result of 'TMkdir' 9p request */
typedef struct TMkdirRes {
/* if requestOnly was set: request object for further processing */
P9Req *req;
} TMkdirRes;
void v9fs_set_allocator(QGuestAllocator *t_alloc);
void v9fs_memwrite(P9Req *req, const void *addr, size_t len);
void v9fs_memskip(P9Req *req, size_t len);
@ -326,8 +359,7 @@ TWriteRes v9fs_twrite(TWriteOpt);
void v9fs_rwrite(P9Req *req, uint32_t *count);
TFlushRes v9fs_tflush(TFlushOpt);
void v9fs_rflush(P9Req *req);
P9Req *v9fs_tmkdir(QVirtio9P *v9p, uint32_t dfid, const char *name,
uint32_t mode, uint32_t gid, uint16_t tag);
TMkdirRes v9fs_tmkdir(TMkdirOpt);
void v9fs_rmkdir(P9Req *req, v9fs_qid *qid);
P9Req *v9fs_tlcreate(QVirtio9P *v9p, uint32_t fid, const char *name,
uint32_t flags, uint32_t mode, uint32_t gid,