[libvirt PATCH 11/23] src: remove use of the term 'whitelist' from remaining code

[Daniel P. Berrangé <berrange@xxxxxxxxxx>]

The terms can be avoided with simple tweaks.

Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
---
 src/libvirt.c           | 2 +-
 src/qemu/qemu_command.c | 2 +-
 src/qemu/qemu_conf.c    | 4 ++--
 src/rpc/gendispatch.pl  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libvirt.c b/src/libvirt.c
index b2d0ba3d23..a0a21fd5d2 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -1025,7 +1025,7 @@ virConnectOpenInternal(const char *name,
             bool matchScheme = false;
             size_t s;
             if (!ret->uri) {
-                VIR_DEBUG("No URI, skipping driver with URI whitelist");
+                VIR_DEBUG("No URI, skipping driver with URI scheme filtering");
                 continue;
             }
             if (embed && !virConnectDriverTab[i]->embeddable) {
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 37113a433a..ff539b1556 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9526,7 +9526,7 @@ qemuBuildSeccompSandboxCommandLine(virCommandPtr cmd,
         return 0;
     }
 
-    /* Seccomp whitelist is opt-in */
+    /* Seccomp sandbox is opt-in */
     if (cfg->seccompSandbox > 0)
         virCommandAddArgList(cmd, "-sandbox", "on", NULL);
 
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 33b3989268..c54f82a75f 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -1854,8 +1854,8 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
     /* By default, filter the SG_IO commands, i.e. set unpriv_sgio to 0.  */
     val = (disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED);
 
-    /* Do not do anything if unpriv_sgio is not supported by the kernel and the
-     * whitelist is enabled.  But if requesting unfiltered access, always call
+    /* Do not do anything if unpriv_sgio is not supported by the kernel and
+     * filtering is enabled.  But if requesting unfiltered access, always call
      * virSetDeviceUnprivSGIO, to report an error for unsupported unpriv_sgio.
      */
     if ((virFileExists(sysfs_path) || val == 1) &&
diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
index 0b2ae59910..6c947beee1 100755
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -171,7 +171,7 @@ sub get_conn_method {
     if ($proc =~ /Connect.*Network/) {
         return "remoteGetNetworkConn";
     }
-    # Carefully whitelist a few APIs with NodeDevice name
+    # Special case a few APIs with NodeDevice name
     # prefix which actually get handled by the virt drivers
     if ($proc =~ /Node.*Device/ &&
         !($proc =~ /NodeDeviceReset/ ||
-- 
2.24.1