diff mbox series

[v3,1/3] hw/9pfs : add spaces around operator

Message ID 20201030043515.1030223-1-zhangxinhao1@huawei.com
State Superseded
Headers show
Series [v3,1/3] hw/9pfs : add spaces around operator | expand

Commit Message

Xinhao Zhang Oct. 30, 2020, 4:35 a.m. UTC 
Fix code style. Operator needs spaces both sides.

Signed-off-by: Xinhao Zhang <zhangxinhao1@huawei.com>
Signed-off-by: Kai Deng <dengkai1@huawei.com>
Reported-by: Euler Robot <euler.robot@huawei.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
---
 hw/9pfs/9p-local.c | 10 +++++-----
 hw/9pfs/9p.c       | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

Comments

Christian Schoenebeck Nov. 3, 2020, 1:50 p.m. UTC | #1 
On Freitag, 30. Oktober 2020 05:35:13 CET Xinhao Zhang wrote:
> Fix code style. Operator needs spaces both sides.

> 

> Signed-off-by: Xinhao Zhang <zhangxinhao1@huawei.com>

> Signed-off-by: Kai Deng <dengkai1@huawei.com>

> Reported-by: Euler Robot <euler.robot@huawei.com>

> Reviewed-by: Greg Kurz <groug@kaod.org>

> ---

>  hw/9pfs/9p-local.c | 10 +++++-----

>  hw/9pfs/9p.c       | 16 ++++++++--------

>  2 files changed, 13 insertions(+), 13 deletions(-)

> 


Queued on 9p.next:
https://github.com/cschoenebeck/qemu/commits/9p.next

Thanks!

---

Actually it's not clear to me why you exactly chose those code style issues to 
fix, as the same files contain more of them, but okay:

scripts/checkpatch.pl -f hw/9pfs/9p-local.c hw/9pfs/9p.c hw/9pfs/9p.h hw/9pfs/
cofs.c
Checking hw/9pfs/9p-local.c...
WARNING: Block comments use a leading /* on a separate line
#289: FILE: hw/9pfs/9p-local.c:289:
+        /* We can't go this far with map_dirfd not being a valid file 
descriptor

WARNING: Block comments use a leading /* on a separate line
#340: FILE: hw/9pfs/9p-local.c:340:
+    /* FIXME: this should be handled with fchmodat(AT_SYMLINK_NOFOLLOW).

WARNING: Block comments use a leading /* on a separate line
#355: FILE: hw/9pfs/9p-local.c:355:
+    /* Fallback for systems that don't support O_PATH: we depend on the file

WARNING: Block comments use a leading /* on a separate line
#372: FILE: hw/9pfs/9p-local.c:372:
+    /* Access modes are ignored when O_PATH is supported. If name is a 
symbolic

WARNING: Block comments use a leading /* on a separate line
#1084: FILE: hw/9pfs/9p-local.c:1084:
+        /* We need to remove the metadata as well:

WARNING: Block comments use a leading /* on a separate line
#1233: FILE: hw/9pfs/9p-local.c:1233:
+                /* Symbolic links are resolved by the client. We can assume

WARNING: line over 80 characters
#1399: FILE: hw/9pfs/9p-local.c:1399:
+static int local_ioc_getversion_init(FsContext *ctx, LocalData *data, Error 
**errp)

total: 0 errors, 7 warnings, 1596 lines checked

hw/9pfs/9p-local.c has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking hw/9pfs/9p.c...
WARNING: Block comments use a trailing */ on a separate line
#237: FILE: hw/9pfs/9p.c:237:
+ * returns 0 if fid got re-opened, 1 if not, < 0 on error */

ERROR: if this code is redundant consider removing it
#3948: FILE: hw/9pfs/9p.c:3948:
+#if 0

total: 1 errors, 1 warnings, 4190 lines checked

hw/9pfs/9p.c has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking hw/9pfs/9p.h...
WARNING: Block comments use a leading /* on a separate line
#140: FILE: hw/9pfs/9p.h:140:
+/* According to the specification, 9p messages start with a 7-byte header.

WARNING: Block comments use a leading /* on a separate line
#158: FILE: hw/9pfs/9p.h:158:
+/* FIXME

ERROR: open brace '{' following struct go on the same line
#177: FILE: hw/9pfs/9p.h:177:
+typedef struct V9fsConf
+{

ERROR: open brace '{' following struct go on the same line
#188: FILE: hw/9pfs/9p.h:188:
+typedef struct V9fsXattr
+{

ERROR: open brace '{' following struct go on the same line
#406: FILE: hw/9pfs/9p.h:406:
+typedef struct V9fsFlock
+{

ERROR: open brace '{' following struct go on the same line
#416: FILE: hw/9pfs/9p.h:416:
+typedef struct V9fsGetlock
+{

total: 4 errors, 2 warnings, 482 lines checked

hw/9pfs/9p.h has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking hw/9pfs/cofs.c...
total: 0 errors, 0 warnings, 372 lines checked

hw/9pfs/cofs.c has no obvious style problems and is ready for submission.

> 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
diff mbox series

Patch

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;
 }