[PATCH v3 0/5] misc: Replace the words 'blacklist/whitelist'

[PATCH v3 0/5] misc: Replace the words 'blacklist/whitelist'

[Philippe Mathieu-Daudé]

Follow the inclusive terminology from the "Conscious Language in your
Open Source Projects" guidelines [*] and replace the words "blacklist"
and "whitelist" appropriately.

Since v2:
- added R-b tags
- reworded seccomp comment (thuth)
- dropped queued vfio patch
- dropped device-crash-test reworked by Eduardo as commit 1a14d4e16af
  ("device-crash-test: Remove problematic language")

Since v1:
- dropped qemu-guest-agent patches
- addressed review comments
- added R-b tags

Series fully reviewed and expected to go via the qemu-trivial@ tree.

[*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md

Philippe Mathieu-Daudé (5):
  ui: Replace the word 'whitelist'
  scripts/tracetool: Replace the word 'whitelist'
  seccomp: Replace the word 'blacklist'
  qemu-options: Replace the word 'blacklist'
  tests/fp/fp-test: Replace the word 'blacklist'

 softmmu/qemu-seccomp.c        | 16 ++++++++--------
 tests/fp/fp-test.c            |  8 ++++----
 ui/console.c                  |  2 +-
 ui/vnc-auth-sasl.c            |  4 ++--
 qemu-options.hx               |  6 +++---
 scripts/tracetool/__init__.py |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

-- 
2.26.2

[PATCH v3 1/5] ui: Replace the word 'whitelist'

[Philippe Mathieu-Daudé]

Follow the inclusive terminology from the "Conscious Language in your
Open Source Projects" guidelines [*] and replace the words "whitelist"
appropriately.

[*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 ui/console.c       | 2 +-
 ui/vnc-auth-sasl.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/console.c b/ui/console.c
index c5d11bc7017..5a8311ced20 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1708,7 +1708,7 @@ bool dpy_gfx_check_format(QemuConsole *con,
                 return false;
             }
         } else {
-            /* default is to whitelist native 32 bpp only */
+            /* default is to allow native 32 bpp only */
             if (format != qemu_default_pixman_format(32, true)) {
                 return false;
             }
diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c
index f67111a3662..df7dc08e9fc 100644
--- a/ui/vnc-auth-sasl.c
+++ b/ui/vnc-auth-sasl.c
@@ -288,7 +288,7 @@ static int protocol_client_auth_sasl_step(VncState *vs, uint8_t *data, size_t le
             goto authreject;
         }
 
-        /* Check username whitelist ACL */
+        /* Check the username access control list */
         if (vnc_auth_sasl_check_access(vs) < 0) {
             goto authreject;
         }
@@ -409,7 +409,7 @@ static int protocol_client_auth_sasl_start(VncState *vs, uint8_t *data, size_t l
             goto authreject;
         }
 
-        /* Check username whitelist ACL */
+        /* Check the username access control list */
         if (vnc_auth_sasl_check_access(vs) < 0) {
             goto authreject;
         }
-- 
2.26.2

[PATCH v3 2/5] scripts/tracetool: Replace the word 'whitelist'

[Philippe Mathieu-Daudé]

Follow the inclusive terminology from the "Conscious Language in your
Open Source Projects" guidelines [*] and replace the words "whitelist"
appropriately.

[*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 scripts/tracetool/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index 96b1cd69a52..5bc94d95cfc 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -100,7 +100,7 @@ def validate_type(name):
         if bit == "const":
             continue
         if bit not in ALLOWED_TYPES:
-            raise ValueError("Argument type '%s' is not in whitelist. "
+            raise ValueError("Argument type '%s' is not allowed. "
                              "Only standard C types and fixed size integer "
                              "types should be used. struct, union, and "
                              "other complex pointer types should be "
-- 
2.26.2

[PATCH v3 3/5] seccomp: Replace the word 'blacklist'

[Philippe Mathieu-Daudé]

Follow the inclusive terminology from the "Conscious Language in your
Open Source Projects" guidelines [*] and replace the word "blacklist"
appropriately.

[*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Acked-by: Eduardo Otubo <otubo@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v3: Reworded comment (thuth)
---
 softmmu/qemu-seccomp.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/softmmu/qemu-seccomp.c b/softmmu/qemu-seccomp.c
index 377ef6937ca..9c29d9cf007 100644
--- a/softmmu/qemu-seccomp.c
+++ b/softmmu/qemu-seccomp.c
@@ -45,8 +45,8 @@ const struct scmp_arg_cmp sched_setscheduler_arg[] = {
     { .arg = 1, .op = SCMP_CMP_NE, .datum_a = SCHED_IDLE }
 };
 
-static const struct QemuSeccompSyscall blacklist[] = {
-    /* default set of syscalls to blacklist */
+static const struct QemuSeccompSyscall denylist[] = {
+    /* default set of syscalls that should get blocked */
     { SCMP_SYS(reboot),                 QEMU_SECCOMP_SET_DEFAULT },
     { SCMP_SYS(swapon),                 QEMU_SECCOMP_SET_DEFAULT },
     { SCMP_SYS(swapoff),                QEMU_SECCOMP_SET_DEFAULT },
@@ -175,18 +175,18 @@ static int seccomp_start(uint32_t seccomp_opts, Error **errp)
         goto seccomp_return;
     }
 
-    for (i = 0; i < ARRAY_SIZE(blacklist); i++) {
+    for (i = 0; i < ARRAY_SIZE(denylist); i++) {
         uint32_t action;
-        if (!(seccomp_opts & blacklist[i].set)) {
+        if (!(seccomp_opts & denylist[i].set)) {
             continue;
         }
 
-        action = qemu_seccomp_get_action(blacklist[i].set);
-        rc = seccomp_rule_add_array(ctx, action, blacklist[i].num,
-                                    blacklist[i].narg, blacklist[i].arg_cmp);
+        action = qemu_seccomp_get_action(denylist[i].set);
+        rc = seccomp_rule_add_array(ctx, action, denylist[i].num,
+                                    denylist[i].narg, denylist[i].arg_cmp);
         if (rc < 0) {
             error_setg_errno(errp, -rc,
-                             "failed to add seccomp blacklist rules");
+                             "failed to add seccomp denylist rules");
             goto seccomp_return;
         }
     }
-- 
2.26.2

[PATCH v3 4/5] qemu-options: Replace the word 'blacklist'

[Philippe Mathieu-Daudé]

Follow the inclusive terminology from the "Conscious Language in your
Open Source Projects" guidelines [*] and replace the word "blacklist"
appropriately.

[*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 qemu-options.hx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index 252db9357ca..8462dc5f158 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -4299,12 +4299,12 @@ DEF("sandbox", HAS_ARG, QEMU_OPTION_sandbox, \
     "                use 'obsolete' to allow obsolete system calls that are provided\n" \
     "                    by the kernel, but typically no longer used by modern\n" \
     "                    C library implementations.\n" \
-    "                use 'elevateprivileges' to allow or deny QEMU process to elevate\n" \
-    "                    its privileges by blacklisting all set*uid|gid system calls.\n" \
+    "                use 'elevateprivileges' to allow or deny the QEMU process ability\n" \
+    "                    to elevate privileges using set*uid|gid system calls.\n" \
     "                    The value 'children' will deny set*uid|gid system calls for\n" \
     "                    main QEMU process but will allow forks and execves to run unprivileged\n" \
     "                use 'spawn' to avoid QEMU to spawn new threads or processes by\n" \
-    "                     blacklisting *fork and execve\n" \
+    "                     blocking *fork and execve\n" \
     "                use 'resourcecontrol' to disable process affinity and schedular priority\n",
     QEMU_ARCH_ALL)
 SRST
-- 
2.26.2

[PATCH v3 5/5] tests/fp/fp-test: Replace the word 'blacklist'

[Philippe Mathieu-Daudé]

Follow the inclusive terminology from the "Conscious Language in your
Open Source Projects" guidelines [*] and replace the word "blacklist"
appropriately.

[*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md

Acked-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/fp/fp-test.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/fp/fp-test.c b/tests/fp/fp-test.c
index 06ffebd6db1..5a4cad8c8b2 100644
--- a/tests/fp/fp-test.c
+++ b/tests/fp/fp-test.c
@@ -123,7 +123,7 @@ static void not_implemented(void)
     fprintf(stderr, "Not implemented.\n");
 }
 
-static bool blacklisted(unsigned op, int rmode)
+static bool is_allowed(unsigned op, int rmode)
 {
     /* odd has not been implemented for any 80-bit ops */
     if (rmode == softfloat_round_odd) {
@@ -161,10 +161,10 @@ static bool blacklisted(unsigned op, int rmode)
         case F32_TO_EXTF80:
         case F64_TO_EXTF80:
         case F128_TO_EXTF80:
-            return true;
+            return false;
         }
     }
-    return false;
+    return true;
 }
 
 static void do_testfloat(int op, int rmode, bool exact)
@@ -194,7 +194,7 @@ static void do_testfloat(int op, int rmode, bool exact)
     verCases_writeFunctionName(stderr);
     fputs("\n", stderr);
 
-    if (blacklisted(op, rmode)) {
+    if (!is_allowed(op, rmode)) {
         not_implemented();
         return;
     }
-- 
2.26.2

Re: [PATCH v3 3/5] seccomp: Replace the word 'blacklist'

[Thomas Huth]

On 03/03/2021 19.46, Philippe Mathieu-Daudé wrote:
> Follow the inclusive terminology from the "Conscious Language in your
> Open Source Projects" guidelines [*] and replace the word "blacklist"
> appropriately.
> 
> [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md
> 
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Acked-by: Eduardo Otubo <otubo@redhat.com>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> v3: Reworded comment (thuth)
> ---
>   softmmu/qemu-seccomp.c | 16 ++++++++--------
>   1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/softmmu/qemu-seccomp.c b/softmmu/qemu-seccomp.c
> index 377ef6937ca..9c29d9cf007 100644
> --- a/softmmu/qemu-seccomp.c
> +++ b/softmmu/qemu-seccomp.c
> @@ -45,8 +45,8 @@ const struct scmp_arg_cmp sched_setscheduler_arg[] = {
>       { .arg = 1, .op = SCMP_CMP_NE, .datum_a = SCHED_IDLE }
>   };
>   
> -static const struct QemuSeccompSyscall blacklist[] = {
> -    /* default set of syscalls to blacklist */
> +static const struct QemuSeccompSyscall denylist[] = {
> +    /* default set of syscalls that should get blocked */
>       { SCMP_SYS(reboot),                 QEMU_SECCOMP_SET_DEFAULT },
>       { SCMP_SYS(swapon),                 QEMU_SECCOMP_SET_DEFAULT },
>       { SCMP_SYS(swapoff),                QEMU_SECCOMP_SET_DEFAULT },
> @@ -175,18 +175,18 @@ static int seccomp_start(uint32_t seccomp_opts, Error **errp)
>           goto seccomp_return;
>       }
>   
> -    for (i = 0; i < ARRAY_SIZE(blacklist); i++) {
> +    for (i = 0; i < ARRAY_SIZE(denylist); i++) {
>           uint32_t action;
> -        if (!(seccomp_opts & blacklist[i].set)) {
> +        if (!(seccomp_opts & denylist[i].set)) {
>               continue;
>           }
>   
> -        action = qemu_seccomp_get_action(blacklist[i].set);
> -        rc = seccomp_rule_add_array(ctx, action, blacklist[i].num,
> -                                    blacklist[i].narg, blacklist[i].arg_cmp);
> +        action = qemu_seccomp_get_action(denylist[i].set);
> +        rc = seccomp_rule_add_array(ctx, action, denylist[i].num,
> +                                    denylist[i].narg, denylist[i].arg_cmp);
>           if (rc < 0) {
>               error_setg_errno(errp, -rc,
> -                             "failed to add seccomp blacklist rules");
> +                             "failed to add seccomp denylist rules");
>               goto seccomp_return;
>           }
>       }
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v3 4/5] qemu-options: Replace the word 'blacklist'

[Thomas Huth]

On 03/03/2021 19.46, Philippe Mathieu-Daudé wrote:
> Follow the inclusive terminology from the "Conscious Language in your
> Open Source Projects" guidelines [*] and replace the word "blacklist"
> appropriately.
> 
> [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md
> 
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>   qemu-options.hx | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 252db9357ca..8462dc5f158 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -4299,12 +4299,12 @@ DEF("sandbox", HAS_ARG, QEMU_OPTION_sandbox, \
>       "                use 'obsolete' to allow obsolete system calls that are provided\n" \
>       "                    by the kernel, but typically no longer used by modern\n" \
>       "                    C library implementations.\n" \
> -    "                use 'elevateprivileges' to allow or deny QEMU process to elevate\n" \
> -    "                    its privileges by blacklisting all set*uid|gid system calls.\n" \
> +    "                use 'elevateprivileges' to allow or deny the QEMU process ability\n" \
> +    "                    to elevate privileges using set*uid|gid system calls.\n" \
>       "                    The value 'children' will deny set*uid|gid system calls for\n" \
>       "                    main QEMU process but will allow forks and execves to run unprivileged\n" \
>       "                use 'spawn' to avoid QEMU to spawn new threads or processes by\n" \
> -    "                     blacklisting *fork and execve\n" \
> +    "                     blocking *fork and execve\n" \
>       "                use 'resourcecontrol' to disable process affinity and schedular priority\n",
>       QEMU_ARCH_ALL)
>   SRST
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v3 5/5] tests/fp/fp-test: Replace the word 'blacklist'

[Thomas Huth]

On 03/03/2021 19.46, Philippe Mathieu-Daudé wrote:
> Follow the inclusive terminology from the "Conscious Language in your
> Open Source Projects" guidelines [*] and replace the word "blacklist"
> appropriately.
> 
> [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md
> 
> Acked-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>   tests/fp/fp-test.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/fp/fp-test.c b/tests/fp/fp-test.c
> index 06ffebd6db1..5a4cad8c8b2 100644
> --- a/tests/fp/fp-test.c
> +++ b/tests/fp/fp-test.c
> @@ -123,7 +123,7 @@ static void not_implemented(void)
>       fprintf(stderr, "Not implemented.\n");
>   }
>   
> -static bool blacklisted(unsigned op, int rmode)
> +static bool is_allowed(unsigned op, int rmode)
>   {
>       /* odd has not been implemented for any 80-bit ops */
>       if (rmode == softfloat_round_odd) {
> @@ -161,10 +161,10 @@ static bool blacklisted(unsigned op, int rmode)
>           case F32_TO_EXTF80:
>           case F64_TO_EXTF80:
>           case F128_TO_EXTF80:
> -            return true;
> +            return false;
>           }
>       }
> -    return false;
> +    return true;
>   }
>   
>   static void do_testfloat(int op, int rmode, bool exact)
> @@ -194,7 +194,7 @@ static void do_testfloat(int op, int rmode, bool exact)
>       verCases_writeFunctionName(stderr);
>       fputs("\n", stderr);
>   
> -    if (blacklisted(op, rmode)) {
> +    if (!is_allowed(op, rmode)) {
>           not_implemented();
>           return;
>       }
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v3 2/5] scripts/tracetool: Replace the word 'whitelist'

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 748 bytes --]

On Wed, Mar 03, 2021 at 07:46:41PM +0100, Philippe Mathieu-Daudé wrote:
> Follow the inclusive terminology from the "Conscious Language in your
> Open Source Projects" guidelines [*] and replace the words "whitelist"
> appropriately.
> 
> [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md
> 
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  scripts/tracetool/__init__.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH v3 1/5] ui: Replace the word 'whitelist'

[Laurent Vivier]

Le 03/03/2021 à 19:46, Philippe Mathieu-Daudé a écrit :
> Follow the inclusive terminology from the "Conscious Language in your
> Open Source Projects" guidelines [*] and replace the words "whitelist"
> appropriately.
> 
> [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md
> 
> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  ui/console.c       | 2 +-
>  ui/vnc-auth-sasl.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/ui/console.c b/ui/console.c
> index c5d11bc7017..5a8311ced20 100644
> --- a/ui/console.c
> +++ b/ui/console.c
> @@ -1708,7 +1708,7 @@ bool dpy_gfx_check_format(QemuConsole *con,
>                  return false;
>              }
>          } else {
> -            /* default is to whitelist native 32 bpp only */
> +            /* default is to allow native 32 bpp only */
>              if (format != qemu_default_pixman_format(32, true)) {
>                  return false;
>              }
> diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c
> index f67111a3662..df7dc08e9fc 100644
> --- a/ui/vnc-auth-sasl.c
> +++ b/ui/vnc-auth-sasl.c
> @@ -288,7 +288,7 @@ static int protocol_client_auth_sasl_step(VncState *vs, uint8_t *data, size_t le
>              goto authreject;
>          }
>  
> -        /* Check username whitelist ACL */
> +        /* Check the username access control list */
>          if (vnc_auth_sasl_check_access(vs) < 0) {
>              goto authreject;
>          }
> @@ -409,7 +409,7 @@ static int protocol_client_auth_sasl_start(VncState *vs, uint8_t *data, size_t l
>              goto authreject;
>          }
>  
> -        /* Check username whitelist ACL */
> +        /* Check the username access control list */
>          if (vnc_auth_sasl_check_access(vs) < 0) {
>              goto authreject;
>          }
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

Re: [PATCH v3 2/5] scripts/tracetool: Replace the word 'whitelist'

[Laurent Vivier]

Le 03/03/2021 à 19:46, Philippe Mathieu-Daudé a écrit :
> Follow the inclusive terminology from the "Conscious Language in your
> Open Source Projects" guidelines [*] and replace the words "whitelist"
> appropriately.
> 
> [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md
> 
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  scripts/tracetool/__init__.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
> index 96b1cd69a52..5bc94d95cfc 100644
> --- a/scripts/tracetool/__init__.py
> +++ b/scripts/tracetool/__init__.py
> @@ -100,7 +100,7 @@ def validate_type(name):
>          if bit == "const":
>              continue
>          if bit not in ALLOWED_TYPES:
> -            raise ValueError("Argument type '%s' is not in whitelist. "
> +            raise ValueError("Argument type '%s' is not allowed. "
>                               "Only standard C types and fixed size integer "
>                               "types should be used. struct, union, and "
>                               "other complex pointer types should be "
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

Re: [PATCH v3 3/5] seccomp: Replace the word 'blacklist'

[Laurent Vivier]

Le 03/03/2021 à 19:46, Philippe Mathieu-Daudé a écrit :
> Follow the inclusive terminology from the "Conscious Language in your
> Open Source Projects" guidelines [*] and replace the word "blacklist"
> appropriately.
> 
> [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md
> 
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Acked-by: Eduardo Otubo <otubo@redhat.com>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> v3: Reworded comment (thuth)
> ---
>  softmmu/qemu-seccomp.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/softmmu/qemu-seccomp.c b/softmmu/qemu-seccomp.c
> index 377ef6937ca..9c29d9cf007 100644
> --- a/softmmu/qemu-seccomp.c
> +++ b/softmmu/qemu-seccomp.c
> @@ -45,8 +45,8 @@ const struct scmp_arg_cmp sched_setscheduler_arg[] = {
>      { .arg = 1, .op = SCMP_CMP_NE, .datum_a = SCHED_IDLE }
>  };
>  
> -static const struct QemuSeccompSyscall blacklist[] = {
> -    /* default set of syscalls to blacklist */
> +static const struct QemuSeccompSyscall denylist[] = {
> +    /* default set of syscalls that should get blocked */
>      { SCMP_SYS(reboot),                 QEMU_SECCOMP_SET_DEFAULT },
>      { SCMP_SYS(swapon),                 QEMU_SECCOMP_SET_DEFAULT },
>      { SCMP_SYS(swapoff),                QEMU_SECCOMP_SET_DEFAULT },
> @@ -175,18 +175,18 @@ static int seccomp_start(uint32_t seccomp_opts, Error **errp)
>          goto seccomp_return;
>      }
>  
> -    for (i = 0; i < ARRAY_SIZE(blacklist); i++) {
> +    for (i = 0; i < ARRAY_SIZE(denylist); i++) {
>          uint32_t action;
> -        if (!(seccomp_opts & blacklist[i].set)) {
> +        if (!(seccomp_opts & denylist[i].set)) {
>              continue;
>          }
>  
> -        action = qemu_seccomp_get_action(blacklist[i].set);
> -        rc = seccomp_rule_add_array(ctx, action, blacklist[i].num,
> -                                    blacklist[i].narg, blacklist[i].arg_cmp);
> +        action = qemu_seccomp_get_action(denylist[i].set);
> +        rc = seccomp_rule_add_array(ctx, action, denylist[i].num,
> +                                    denylist[i].narg, denylist[i].arg_cmp);
>          if (rc < 0) {
>              error_setg_errno(errp, -rc,
> -                             "failed to add seccomp blacklist rules");
> +                             "failed to add seccomp denylist rules");
>              goto seccomp_return;
>          }
>      }
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

Re: [PATCH v3 5/5] tests/fp/fp-test: Replace the word 'blacklist'

[Laurent Vivier]

Le 03/03/2021 à 19:46, Philippe Mathieu-Daudé a écrit :
> Follow the inclusive terminology from the "Conscious Language in your
> Open Source Projects" guidelines [*] and replace the word "blacklist"
> appropriately.
> 
> [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md
> 
> Acked-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  tests/fp/fp-test.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/fp/fp-test.c b/tests/fp/fp-test.c
> index 06ffebd6db1..5a4cad8c8b2 100644
> --- a/tests/fp/fp-test.c
> +++ b/tests/fp/fp-test.c
> @@ -123,7 +123,7 @@ static void not_implemented(void)
>      fprintf(stderr, "Not implemented.\n");
>  }
>  
> -static bool blacklisted(unsigned op, int rmode)
> +static bool is_allowed(unsigned op, int rmode)
>  {
>      /* odd has not been implemented for any 80-bit ops */
>      if (rmode == softfloat_round_odd) {
> @@ -161,10 +161,10 @@ static bool blacklisted(unsigned op, int rmode)
>          case F32_TO_EXTF80:
>          case F64_TO_EXTF80:
>          case F128_TO_EXTF80:
> -            return true;
> +            return false;
>          }
>      }
> -    return false;
> +    return true;
>  }
>  
>  static void do_testfloat(int op, int rmode, bool exact)
> @@ -194,7 +194,7 @@ static void do_testfloat(int op, int rmode, bool exact)
>      verCases_writeFunctionName(stderr);
>      fputs("\n", stderr);
>  
> -    if (blacklisted(op, rmode)) {
> +    if (!is_allowed(op, rmode)) {
>          not_implemented();
>          return;
>      }
> 

Applied to my trivial-patches branch.

Thanks,
Laurent