* [PATCH 1/3] hw/9pfs : add spaces around operator
@ 2020-10-28 9:05 jokenzhang
2020-10-28 9:05 ` [PATCH 2/3] hw/9pfs : open brace '{' following struct go on the same line jokenzhang
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: jokenzhang @ 2020-10-28 9:05 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.chen, qemu-trivial, dengkai1
Signed-off-by: jokenzhang <zhangxinhao1@huawei.com>
Signed-off-by: Kai Deng <dengkai1@huawei.com>
Reported-by: Euler Robot <euler.robot@huawei.com>
---
hw/9pfs/9p-local.c | 10 +++++-----
hw/9pfs/9p.c | 16 ++++++++--------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index 3107637209..af52c1daac 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -162,13 +162,13 @@ static void local_mapped_file_attr(int dirfd, const char *name,
memset(buf, 0, ATTR_MAX);
while (fgets(buf, ATTR_MAX, fp)) {
if (!strncmp(buf, "virtfs.uid", 10)) {
- stbuf->st_uid = atoi(buf+11);
+ stbuf->st_uid = atoi(buf + 11);
} else if (!strncmp(buf, "virtfs.gid", 10)) {
- stbuf->st_gid = atoi(buf+11);
+ stbuf->st_gid = atoi(buf + 11);
} else if (!strncmp(buf, "virtfs.mode", 11)) {
- stbuf->st_mode = atoi(buf+12);
+ stbuf->st_mode = atoi(buf + 12);
} else if (!strncmp(buf, "virtfs.rdev", 11)) {
- stbuf->st_rdev = atoi(buf+12);
+ stbuf->st_rdev = atoi(buf + 12);
}
memset(buf, 0, ATTR_MAX);
}
@@ -823,7 +823,7 @@ static int local_open2(FsContext *fs_ctx, V9fsPath *dir_path, const char *name,
if (fd == -1) {
goto out;
}
- credp->fc_mode = credp->fc_mode|S_IFREG;
+ credp->fc_mode = credp->fc_mode | S_IFREG;
if (fs_ctx->export_flags & V9FS_SM_MAPPED) {
/* Set cleint credentials in xattr */
err = local_set_xattrat(dirfd, name, credp);
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index 741d222c3f..94df440fc7 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -1091,7 +1091,7 @@ static mode_t v9mode_to_mode(uint32_t mode, V9fsString *extension)
}
}
- if (!(ret&~0777)) {
+ if (!(ret & ~0777)) {
ret |= S_IFREG;
}
@@ -2776,7 +2776,7 @@ static void coroutine_fn v9fs_create(void *opaque)
v9fs_path_unlock(s);
} else {
err = v9fs_co_open2(pdu, fidp, &name, -1,
- omode_to_uflags(mode)|O_CREAT, perm, &stbuf);
+ omode_to_uflags(mode) | O_CREAT, perm, &stbuf);
if (err < 0) {
goto out;
}
@@ -3428,7 +3428,7 @@ static int v9fs_fill_statfs(V9fsState *s, V9fsPDU *pdu, struct statfs *stbuf)
* compute bsize factor based on host file system block size
* and client msize
*/
- bsize_factor = (s->msize - P9_IOHDRSZ)/stbuf->f_bsize;
+ bsize_factor = (s->msize - P9_IOHDRSZ) / stbuf->f_bsize;
if (!bsize_factor) {
bsize_factor = 1;
}
@@ -3440,9 +3440,9 @@ static int v9fs_fill_statfs(V9fsState *s, V9fsPDU *pdu, struct statfs *stbuf)
* adjust(divide) the number of blocks, free blocks and available
* blocks by bsize factor
*/
- f_blocks = stbuf->f_blocks/bsize_factor;
- f_bfree = stbuf->f_bfree/bsize_factor;
- f_bavail = stbuf->f_bavail/bsize_factor;
+ f_blocks = stbuf->f_blocks / bsize_factor;
+ f_bfree = stbuf->f_bfree / bsize_factor;
+ f_bavail = stbuf->f_bavail / bsize_factor;
f_files = stbuf->f_files;
f_ffree = stbuf->f_ffree;
fsid_val = (unsigned int) stbuf->f_fsid.__val[0] |
@@ -4185,6 +4185,6 @@ static void __attribute__((__constructor__)) v9fs_set_fd_limit(void)
error_report("Failed to get the resource limit");
exit(1);
}
- open_fd_hw = rlim.rlim_cur - MIN(400, rlim.rlim_cur/3);
- open_fd_rc = rlim.rlim_cur/2;
+ open_fd_hw = rlim.rlim_cur - MIN(400, rlim.rlim_cur / 3);
+ open_fd_rc = rlim.rlim_cur / 2;
}
--
2.29.0-rc1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] hw/9pfs : open brace '{' following struct go on the same line
2020-10-28 9:05 [PATCH 1/3] hw/9pfs : add spaces around operator jokenzhang
@ 2020-10-28 9:05 ` jokenzhang
2020-10-28 9:05 ` [PATCH 3/3] hw/9pfs : add space before the open parenthesis '(' jokenzhang
2020-10-29 10:29 ` [PATCH 1/3] hw/9pfs : add spaces around operator Christian Schoenebeck
2 siblings, 0 replies; 4+ messages in thread
From: jokenzhang @ 2020-10-28 9:05 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.chen, qemu-trivial, dengkai1
Signed-off-by: jokenzhang <zhangxinhao1@huawei.com>
Signed-off-by: Kai Deng <dengkai1@huawei.com>
Reported-by: Euler Robot <euler.robot@huawei.com>
---
hw/9pfs/9p.h | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h
index 3dd1b50b1a..32df81f360 100644
--- a/hw/9pfs/9p.h
+++ b/hw/9pfs/9p.h
@@ -143,8 +143,7 @@ typedef struct {
*/
QEMU_BUILD_BUG_ON(sizeof(P9MsgHeader) != 7);
-struct V9fsPDU
-{
+struct V9fsPDU {
uint32_t size;
uint16_t tag;
uint8_t id;
@@ -270,8 +269,7 @@ union V9fsFidOpenState {
void *private;
};
-struct V9fsFidState
-{
+struct V9fsFidState {
int fid_type;
int32_t fid;
V9fsPath path;
@@ -338,8 +336,7 @@ typedef struct {
uint64_t path;
} QpfEntry;
-struct V9fsState
-{
+struct V9fsState {
QLIST_HEAD(, V9fsPDU) free_list;
QLIST_HEAD(, V9fsPDU) active_list;
V9fsFidState *fid_list;
--
2.29.0-rc1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] hw/9pfs : add space before the open parenthesis '('
2020-10-28 9:05 [PATCH 1/3] hw/9pfs : add spaces around operator jokenzhang
2020-10-28 9:05 ` [PATCH 2/3] hw/9pfs : open brace '{' following struct go on the same line jokenzhang
@ 2020-10-28 9:05 ` jokenzhang
2020-10-29 10:29 ` [PATCH 1/3] hw/9pfs : add spaces around operator Christian Schoenebeck
2 siblings, 0 replies; 4+ messages in thread
From: jokenzhang @ 2020-10-28 9:05 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.chen, qemu-trivial, dengkai1
Signed-off-by: jokenzhang <zhangxinhao1@huawei.com>
Signed-off-by: Kai Deng <dengkai1@huawei.com>
Reported-by: Euler Robot <euler.robot@huawei.com>
---
hw/9pfs/cofs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/9pfs/cofs.c b/hw/9pfs/cofs.c
index 55991916ec..0b321b456e 100644
--- a/hw/9pfs/cofs.c
+++ b/hw/9pfs/cofs.c
@@ -23,7 +23,7 @@ static ssize_t __readlink(V9fsState *s, V9fsPath *path, V9fsString *buf)
ssize_t len, maxlen = PATH_MAX;
buf->data = g_malloc(PATH_MAX);
- for(;;) {
+ for (;;) {
len = s->ops->readlink(&s->ctx, path, buf->data, maxlen);
if (len < 0) {
g_free(buf->data);
--
2.29.0-rc1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] hw/9pfs : add spaces around operator
2020-10-28 9:05 [PATCH 1/3] hw/9pfs : add spaces around operator jokenzhang
2020-10-28 9:05 ` [PATCH 2/3] hw/9pfs : open brace '{' following struct go on the same line jokenzhang
2020-10-28 9:05 ` [PATCH 3/3] hw/9pfs : add space before the open parenthesis '(' jokenzhang
@ 2020-10-29 10:29 ` Christian Schoenebeck
2 siblings, 0 replies; 4+ messages in thread
From: Christian Schoenebeck @ 2020-10-29 10:29 UTC (permalink / raw)
To: qemu-devel; +Cc: jokenzhang, alex.chen, qemu-trivial, dengkai1, Greg Kurz
On Mittwoch, 28. Oktober 2020 10:05:38 CET jokenzhang wrote:
> Signed-off-by: jokenzhang <zhangxinhao1@huawei.com>
> Signed-off-by: Kai Deng <dengkai1@huawei.com>
> Reported-by: Euler Robot <euler.robot@huawei.com>
> ---
> hw/9pfs/9p-local.c | 10 +++++-----
> hw/9pfs/9p.c | 16 ++++++++--------
> 2 files changed, 13 insertions(+), 13 deletions(-)
It would make sense to mention the actual purpose of this patch: fix code
style.
Same applies to the other 2 patches.
>
> diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
> index 3107637209..af52c1daac 100644
> --- a/hw/9pfs/9p-local.c
> +++ b/hw/9pfs/9p-local.c
> @@ -162,13 +162,13 @@ static void local_mapped_file_attr(int dirfd, const
> char *name, memset(buf, 0, ATTR_MAX);
> while (fgets(buf, ATTR_MAX, fp)) {
> if (!strncmp(buf, "virtfs.uid", 10)) {
> - stbuf->st_uid = atoi(buf+11);
> + stbuf->st_uid = atoi(buf + 11);
> } else if (!strncmp(buf, "virtfs.gid", 10)) {
> - stbuf->st_gid = atoi(buf+11);
> + stbuf->st_gid = atoi(buf + 11);
> } else if (!strncmp(buf, "virtfs.mode", 11)) {
> - stbuf->st_mode = atoi(buf+12);
> + stbuf->st_mode = atoi(buf + 12);
> } else if (!strncmp(buf, "virtfs.rdev", 11)) {
> - stbuf->st_rdev = atoi(buf+12);
> + stbuf->st_rdev = atoi(buf + 12);
> }
> memset(buf, 0, ATTR_MAX);
> }
> @@ -823,7 +823,7 @@ static int local_open2(FsContext *fs_ctx, V9fsPath
> *dir_path, const char *name, if (fd == -1) {
> goto out;
> }
> - credp->fc_mode = credp->fc_mode|S_IFREG;
> + credp->fc_mode = credp->fc_mode | S_IFREG;
> if (fs_ctx->export_flags & V9FS_SM_MAPPED) {
> /* Set cleint credentials in xattr */
> err = local_set_xattrat(dirfd, name, credp);
> diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
> index 741d222c3f..94df440fc7 100644
> --- a/hw/9pfs/9p.c
> +++ b/hw/9pfs/9p.c
> @@ -1091,7 +1091,7 @@ static mode_t v9mode_to_mode(uint32_t mode, V9fsString
> *extension) }
> }
>
> - if (!(ret&~0777)) {
> + if (!(ret & ~0777)) {
> ret |= S_IFREG;
> }
>
> @@ -2776,7 +2776,7 @@ static void coroutine_fn v9fs_create(void *opaque)
> v9fs_path_unlock(s);
> } else {
> err = v9fs_co_open2(pdu, fidp, &name, -1,
> - omode_to_uflags(mode)|O_CREAT, perm, &stbuf);
> + omode_to_uflags(mode) | O_CREAT, perm, &stbuf);
> if (err < 0) {
> goto out;
> }
> @@ -3428,7 +3428,7 @@ static int v9fs_fill_statfs(V9fsState *s, V9fsPDU
> *pdu, struct statfs *stbuf) * compute bsize factor based on host file
> system block size
> * and client msize
> */
> - bsize_factor = (s->msize - P9_IOHDRSZ)/stbuf->f_bsize;
> + bsize_factor = (s->msize - P9_IOHDRSZ) / stbuf->f_bsize;
> if (!bsize_factor) {
> bsize_factor = 1;
> }
> @@ -3440,9 +3440,9 @@ static int v9fs_fill_statfs(V9fsState *s, V9fsPDU
> *pdu, struct statfs *stbuf) * adjust(divide) the number of blocks, free
> blocks and available * blocks by bsize factor
> */
> - f_blocks = stbuf->f_blocks/bsize_factor;
> - f_bfree = stbuf->f_bfree/bsize_factor;
> - f_bavail = stbuf->f_bavail/bsize_factor;
> + f_blocks = stbuf->f_blocks / bsize_factor;
> + f_bfree = stbuf->f_bfree / bsize_factor;
> + f_bavail = stbuf->f_bavail / bsize_factor;
> f_files = stbuf->f_files;
> f_ffree = stbuf->f_ffree;
> fsid_val = (unsigned int) stbuf->f_fsid.__val[0] |
> @@ -4185,6 +4185,6 @@ static void __attribute__((__constructor__))
> v9fs_set_fd_limit(void) error_report("Failed to get the resource limit");
> exit(1);
> }
> - open_fd_hw = rlim.rlim_cur - MIN(400, rlim.rlim_cur/3);
> - open_fd_rc = rlim.rlim_cur/2;
> + open_fd_hw = rlim.rlim_cur - MIN(400, rlim.rlim_cur / 3);
> + open_fd_rc = rlim.rlim_cur / 2;
> }
Best regards,
Christian Schoenebeck
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-29 10:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-28 9:05 [PATCH 1/3] hw/9pfs : add spaces around operator jokenzhang
2020-10-28 9:05 ` [PATCH 2/3] hw/9pfs : open brace '{' following struct go on the same line jokenzhang
2020-10-28 9:05 ` [PATCH 3/3] hw/9pfs : add space before the open parenthesis '(' jokenzhang
2020-10-29 10:29 ` [PATCH 1/3] hw/9pfs : add spaces around operator Christian Schoenebeck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.