From nobody Tue Nov 18 18:19:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612299517; cv=none; d=zohomail.com; s=zohoarc; b=KnukSJPDMY46k4oIW/PIb92EXc7zYhEAzIizs5Y4BIO9xtTCL8Xv7j2FPiC0oTKLOF3rEDZjWr0KJHcPbCS4akQk3bZYG2Oq+K80pj7hhsrPMy19/pPG/o2XUTub4MBq3KHer/Rp3HKkPBVnhz4rFWYjOhTNVBxJrps1CRrBYuY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612299517; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=PZPBR0BclVqF/rPEj/0RS+FyJc1foHcMXsjRFpfwuw0=; b=LpreqsV2C7Qw4Lg+jNsJvj/OHzQTxWOPKGP3qJvt08/L1oGpV9KwtG7HHBFe26tEJUYFDdtPimpaTH6hMZDmDXTSDtgJ5LZ5btS54jeHiDUe8cHTJvBLIc/1CJ9ONS+SbP/svZciLrqn0Cnz/UPhsLR+QMZVv5/lnSPxvqMuhg0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612299517947471.00862936984174; Tue, 2 Feb 2021 12:58:37 -0800 (PST) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-384-VIGONt-uNGe57xcRwRWWiw-1; Tue, 02 Feb 2021 15:58:35 -0500 Received: by mail-ej1-f70.google.com with SMTP id ox17so10576843ejb.2 for ; Tue, 02 Feb 2021 12:58:34 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id m20sm11070885edj.43.2021.02.02.12.58.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:58:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612299516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PZPBR0BclVqF/rPEj/0RS+FyJc1foHcMXsjRFpfwuw0=; b=MSb9kWxbwVQjRrqdFGKNFoCY81NmNLb+WWxITXbZz/QjJh6Yx5AcjpGxlBYQ7786iyUHny GYFQ0nvynS1V7IVWUTPgKIh08sJa89Bpzdapz+cj3NnJGo6ehoROm/G9FYaGiWT9wJJ0up 5FRYwD46+UZ85CgYZX3gMlWAipTMu+4= X-MC-Unique: VIGONt-uNGe57xcRwRWWiw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PZPBR0BclVqF/rPEj/0RS+FyJc1foHcMXsjRFpfwuw0=; b=XGSXc6W7e8sYcQes/tGaSfR3HrFnE92xHWjIW/c3GFH/7B8XDgj1g+rvkLp3+eW/do XoYySFJ1qeCf57zNzukPm9TlyUngM29OXa0vZrMzPuoI+7fs/OiEmHSfB+w1i/Jf0gWZ vu1QbzLotMg54Vy8RJNCOkw7jmG+O2ZF+Cd+NDdQUpy1xLoGAwDkKSqZod/TJ6H/pgqW AD3De8kj8owB38f5RPpwfNJhezC2iAmYMaFtZKlaitL/IvmFHg7FAgfgwQE+yzgTK1yZ LO5S3fvlZibY4NmQ+AFD40EVZjguhK+XKcZp5evndlwSBNYfuDC1ZFjSUzwEP3fA/bDP pcXg== X-Gm-Message-State: AOAM531Cxl5mZHX6F++nTQP1XB4Y87wR+fWlL513XbcXPRybhCKUt9rB TfkP1Urx8tf8aB+XFil5cnRoAAsbvAlEvRT8GMPn9r3SldQbmY+4u5uVFUAXBubn94KQr2lYl+H q3c3Mg2esnMLuCw== X-Received: by 2002:a17:907:1119:: with SMTP id qu25mr24016354ejb.268.1612299513491; Tue, 02 Feb 2021 12:58:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJymbmDOo6GPWGb/jU5IhVlxX6hUuAck3+KKDqahjKh8eC/XKSQkS73/g5CdNQVsl0N+em9GIw== X-Received: by 2002:a17:907:1119:: with SMTP id qu25mr24016343ejb.268.1612299513347; Tue, 02 Feb 2021 12:58:33 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Dr. David Alan Gilbert" , Eduardo Otubo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , Aurelien Jarno , qemu-block@nongnu.org, Kevin Wolf , Michael Roth , Peter Maydell , Alex Williamson , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 01/12] ui: Replace the word 'whitelist' Date: Tue, 2 Feb 2021 21:58:13 +0100 Message-Id: <20210202205824.1085853-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210202205824.1085853-1-philmd@redhat.com> References: <20210202205824.1085853-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Gerd Hoffmann --- 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 d80ce7037c3..9e13bf9020f 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1661,7 +1661,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 !=3D qemu_default_pixman_format(32, true)) { return false; } diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c index f67111a3662..dde4b8d4144 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; } =20 - /* Check username whitelist ACL */ + /* Check username allowlist ACL */ 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; } =20 - /* Check username whitelist ACL */ + /* Check username allowlist ACL */ if (vnc_auth_sasl_check_access(vs) < 0) { goto authreject; } --=20 2.26.2 From nobody Tue Nov 18 18:19:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612299531; cv=none; d=zohomail.com; s=zohoarc; b=aetZBcsl3Ep4wgrGh8Lh4zk3CXjwYoDo7zL+ZgbQHvTlaGB4GmPxymWGS/Uue/yUt4GhwqGB+15TbOkvCFFkYpXhdgIGCIxC19EXsNFDQvkedahKrMhY7gelW8YF3R2evqe0LlBv5UDiKBUkFsL1R9TZXyw/ACm/9V1i1lMiiq4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612299531; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=8Xlu9C8l46HeJfL6X9SL2SiRfjv5SEslChtTTiGjH9U=; b=iLgserSn3YtcfKfjDqW/A+CwlAg8gZM+Q36+DBOjgFq3KybzDNq2ml2vMyvPAleMH+DrMVwXU68pBwAUxcPdUprAVGhkK/p3+8YTUeYW0AG1zpTpi/nKKH6WhRqmhB1XdlKt9QDcA/NJnG6EMoPeptiKOUWSblCI4P6yV5lEX2c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612299531850497.2569002965041; Tue, 2 Feb 2021 12:58:51 -0800 (PST) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-230-PlToYdXzNPWH5IVTWYDFBg-1; Tue, 02 Feb 2021 15:58:47 -0500 Received: by mail-ed1-f70.google.com with SMTP id v19so10227244edx.22 for ; Tue, 02 Feb 2021 12:58:46 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id e19sm10317539eds.79.2021.02.02.12.58.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:58:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612299530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8Xlu9C8l46HeJfL6X9SL2SiRfjv5SEslChtTTiGjH9U=; b=WiAfl+fxzkiGvd3ntMjm7AkUBZRglz8Omo3sDiaqwy6Y87Tls2dIk7bbAy+auevLhGglWz LE6reiLqwwzg5i40f8vFE3IPAo5eDVMVMPwsepY3iqw8PahMNkKE1ORHWOY+QMeBIMjFw6 bZEykfqWG7ePKiNIiTvRGYpYLMt/Sys= X-MC-Unique: PlToYdXzNPWH5IVTWYDFBg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8Xlu9C8l46HeJfL6X9SL2SiRfjv5SEslChtTTiGjH9U=; b=RqYVNM89S0FExKGvJ51Ns9jeM+xCRh8BeA1jGdzVl7EWHq9g+k+nLRSTUmSGexKW+K fQJmt/lwzl3/ikHP7YOGeuuucY+8vEdLbOXKjlqonZ3vafDXe0FkaHCO46e4TGfIRWYU 9PmjkV+hlHft9Nirf+NYc/TSbg3+OUjIQeSEW0mu67H4HQl/lod6xuuuTGOnQoc6O9B/ w77OQ2RecodHwy3Zt9T3maZ3Y02h9Lyy9M6A2HWFd+CfnAr6TTpYkyx9P1/FAwBfZK1r /AWoMIgc00oYRBHCqR0A2YbGITfBMaFfgRnZ6bo7WRpAPC7gZtK6h7YRY3b33NnuRvyy 2iag== X-Gm-Message-State: AOAM532CU9KwmaeVzzCCpN4uXs/TBzpKaopUzP2gGdx06jeT4b7CJERZ p1+5uWc0kZC4ffoJWJfJtKPDcTbBlXdfGeZasmKuIPwE+G4IqL355RYuSTT8tLKvrKBjCdxc5gG w670va0FzyS3oug== X-Received: by 2002:a17:907:1629:: with SMTP id hb41mr23301303ejc.197.1612299525657; Tue, 02 Feb 2021 12:58:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJycaM0s5bvfuIyFO+Pkw6XoqVYUhO0v3msX2x1AnXKxmRoILwJHUkIOlEmXapI+Fa2EcyHSvA== X-Received: by 2002:a17:907:1629:: with SMTP id hb41mr23301298ejc.197.1612299525524; Tue, 02 Feb 2021 12:58:45 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Dr. David Alan Gilbert" , Eduardo Otubo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , Aurelien Jarno , qemu-block@nongnu.org, Kevin Wolf , Michael Roth , Peter Maydell , Alex Williamson , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 02/12] qga: Rename config key 'blacklist' as 'denylist' Date: Tue, 2 Feb 2021 21:58:14 +0100 Message-Id: <20210202205824.1085853-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210202205824.1085853-1-philmd@redhat.com> References: <20210202205824.1085853-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/interop/qemu-ga.rst | 2 +- qga/main.c | 15 +++++++++++---- tests/test-qga.c | 8 ++++---- tests/data/test-qga-config | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/docs/interop/qemu-ga.rst b/docs/interop/qemu-ga.rst index 3063357bb5d..9a590bf95cb 100644 --- a/docs/interop/qemu-ga.rst +++ b/docs/interop/qemu-ga.rst @@ -125,7 +125,7 @@ pidfile string fsfreeze-hook string statedir string verbose boolean -blacklist string list +denylist string list =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 See also diff --git a/qga/main.c b/qga/main.c index e7f8f3b1616..249fe06e8e5 100644 --- a/qga/main.c +++ b/qga/main.c @@ -962,6 +962,7 @@ static void config_load(GAConfig *config) GError *gerr =3D NULL; GKeyFile *keyfile; g_autofree char *conf =3D g_strdup(g_getenv("QGA_CONF")) ?: get_reloca= ted_path(QGA_CONF_DEFAULT); + const gchar *denylist_key =3D "denylist"; =20 /* read system config */ keyfile =3D g_key_file_new(); @@ -1008,10 +1009,16 @@ static void config_load(GAConfig *config) config->retry_path =3D g_key_file_get_boolean(keyfile, "general", "retry-path", &gerr= ); } + if (g_key_file_has_key(keyfile, "general", "blacklist", NULL)) { + g_warning("config using deprecated 'blacklist' key, now replaced" + " by the 'denylist' key."); + denylist_key =3D "blacklist"; + } + if (g_key_file_has_key(keyfile, "general", denylist_key, NULL)) { config->bliststr =3D - g_key_file_get_string(keyfile, "general", "blacklist", &gerr); - config->blacklist =3D g_list_concat(config->blacklist, + g_key_file_get_string(keyfile, "general", denylist_key, &gerr); + config->denylist =3D g_list_concat(config->denylist, split_list(config->bliststr, ","= )); } =20 @@ -1071,8 +1078,8 @@ static void config_dump(GAConfig *config) config->log_level =3D=3D G_LOG_LEVEL_MASK); g_key_file_set_boolean(keyfile, "general", "retry-path", config->retry_path); - tmp =3D list_join(config->blacklist, ','); - g_key_file_set_string(keyfile, "general", "blacklist", tmp); + tmp =3D list_join(config->denylist, ','); + g_key_file_set_string(keyfile, "general", "denylist", tmp); g_free(tmp); =20 tmp =3D g_key_file_to_data(keyfile, NULL, &error); diff --git a/tests/test-qga.c b/tests/test-qga.c index eb33264e8ed..c2836244b04 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -655,7 +655,7 @@ static void test_qga_get_time(gconstpointer fix) qobject_unref(ret); } =20 -static void test_qga_blacklist(gconstpointer data) +static void test_qga_denylist(gconstpointer data) { TestFixture fix; QDict *ret, *error; @@ -663,7 +663,7 @@ static void test_qga_blacklist(gconstpointer data) =20 fixture_setup(&fix, "-b guest-ping,guest-get-time", NULL); =20 - /* check blacklist */ + /* check denylist */ ret =3D qmp_fd(fix.fd, "{'execute': 'guest-ping'}"); g_assert_nonnull(ret); error =3D qdict_get_qdict(ret, "error"); @@ -752,7 +752,7 @@ static void test_qga_config(gconstpointer data) g_assert_true(g_key_file_get_boolean(kf, "general", "verbose", &error)= ); g_assert_no_error(error); =20 - strv =3D g_key_file_get_string_list(kf, "general", "blacklist", &n, &e= rror); + strv =3D g_key_file_get_string_list(kf, "general", "denylist", &n, &er= ror); g_assert_cmpint(n, =3D=3D, 2); g_assert_true(g_strv_contains((const char * const *)strv, "guest-ping")); @@ -997,7 +997,7 @@ int main(int argc, char **argv) g_test_add_data_func("/qga/fsfreeze-status", &fix, test_qga_fsfreeze_status); =20 - g_test_add_data_func("/qga/blacklist", NULL, test_qga_blacklist); + g_test_add_data_func("/qga/denylist", NULL, test_qga_denylist); g_test_add_data_func("/qga/config", NULL, test_qga_config); g_test_add_data_func("/qga/guest-exec", &fix, test_qga_guest_exec); g_test_add_data_func("/qga/guest-exec-invalid", &fix, diff --git a/tests/data/test-qga-config b/tests/data/test-qga-config index 4bb721a4a18..d9ddc1a4d96 100644 --- a/tests/data/test-qga-config +++ b/tests/data/test-qga-config @@ -5,4 +5,4 @@ path=3D/path/to/org.qemu.guest_agent.0 pidfile=3D/var/foo/qemu-ga.pid statedir=3D/var/state verbose=3Dtrue -blacklist=3Dguest-ping;guest-get-time +denylist=3Dguest-ping;guest-get-time --=20 2.26.2 From nobody Tue Nov 18 18:19:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612299542; cv=none; d=zohomail.com; s=zohoarc; b=Duhi+TPwrKB/9RfiKzjCE4HG1URnT3fJcX0ecWAVeK9NwJUR651R9Cadid9o3y/tB+P4bE01Ye59aqVT6eRigOyiIN8jc/Rw7ooT9IqACXl8f572iOMpvxrwAv5cJcnzktQI1xAmxYHqfW7qY91A0cA7Nx6bIj+/F1DxHyVmCRY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612299542; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Rv5my3HSU2RkuIlLbBGZUl/Fhu0zFPDOiXMImWA+5ZI=; b=kVKH0jtP4z6BJhxRcoh6pIRPxxZWU3Ea/g+B9yMie8EkCjvkHwcmqRJboxYLupSExnDljOur76bsQlKLPX/xNcEYiMwfaDAFICDn0eRrHZOZ1hcw4JJkcsUL6dRs8EkJNv8RwqnDqqc5SVquUZsk24DPlwTvdkiR/ymA1hDsffw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612299542469702.2037293663986; Tue, 2 Feb 2021 12:59:02 -0800 (PST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-198-mm1TECuhMPeX4At2P2Tz6w-1; Tue, 02 Feb 2021 15:58:57 -0500 Received: by mail-wr1-f71.google.com with SMTP id n18so13208530wrm.8 for ; Tue, 02 Feb 2021 12:58:57 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id b3sm5776109wme.32.2021.02.02.12.58.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:58:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612299541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Rv5my3HSU2RkuIlLbBGZUl/Fhu0zFPDOiXMImWA+5ZI=; b=Rfyyt3T0eQ+ousvPphK8PZyANmhPBA7hRaNsOI2BDc3tdN8c6ucL20DAkmsMiHYBmu9CUS oFNHoiur1aT6yK+bOpyaTX0JL0L/2T8YepLAuywmyVGZcsIsKdSfCgbdNDTL+4zMfcQDlT 47iLzbI4TPjpURMLeI0YaEHtwOJMQms= X-MC-Unique: mm1TECuhMPeX4At2P2Tz6w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Rv5my3HSU2RkuIlLbBGZUl/Fhu0zFPDOiXMImWA+5ZI=; b=JXHC6t3eKNtRngHYwHlbnvcGKlkHiufg1gI7ZKUJXZG7r7wkP0LnSG2jB9XNvLIsOz ANvq9qz5arI0gJKGrMEDdy7bAk4VM8/6WBlFAokVcGG/5sIlRvocPXXbhgnzTveKTPrh CCE5y1x9qtGAJKMNfEouhR7vL1xUtNmwKJSKEeqXhQ82iSlvyG1NDej2CTG3CIdCnVmF vipDFUJqQvQ50S3w3fPbl2rlfJkyeHxJGNDQoaiuJrxNIrRZuwzomgotK5ZVb3kWzQ1W j1fB7dEiB5843y84fop5nh8sQKfgr2j2kIwT1RpZ4b4o5v0YBodPm2mEC2Rnh/Y70Bw+ QS/g== X-Gm-Message-State: AOAM531iXlPTkVMhtZ+pgvZ8dMOZES67CuEsvynijJC4HlbuIuJ+I9Ni cC4dwTtzCwRjNWy9wKH2Oill+R3ljl+vg2gbWpKIbXpPj0HAoharoH6L4DLH7sRNgWpjWulz8yL LedGKLP0cOA04qA== X-Received: by 2002:a05:600c:2281:: with SMTP id 1mr5458531wmf.150.1612299536321; Tue, 02 Feb 2021 12:58:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmQ06aMoRrIgRRrbMW/I6RMZgQD04A5Ja2YIOdLOi8cQzOd1xcgkLTgGTPUpM8KDc5bLFOww== X-Received: by 2002:a05:600c:2281:: with SMTP id 1mr5458524wmf.150.1612299536146; Tue, 02 Feb 2021 12:58:56 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Dr. David Alan Gilbert" , Eduardo Otubo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , Aurelien Jarno , qemu-block@nongnu.org, Kevin Wolf , Michael Roth , Peter Maydell , Alex Williamson , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 03/12] qga: Replace '--blacklist' command line option by '--denylist' Date: Tue, 2 Feb 2021 21:58:15 +0100 Message-Id: <20210202205824.1085853-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210202205824.1085853-1-philmd@redhat.com> References: <20210202205824.1085853-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Follow the inclusive terminology from the "Conscious Language in your Open Source Projects" guidelines [*] and replace the word "blacklist" appropriately. Keep the --blacklist available for backward compatibility. [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/interop/qemu-ga.rst | 2 +- qga/main.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/interop/qemu-ga.rst b/docs/interop/qemu-ga.rst index 9a590bf95cb..89596e646de 100644 --- a/docs/interop/qemu-ga.rst +++ b/docs/interop/qemu-ga.rst @@ -79,7 +79,7 @@ Options =20 Daemonize after startup (detach from terminal). =20 -.. option:: -b, --blacklist=3DLIST +.. option:: -b, --denylist=3DLIST =20 Comma-separated list of RPCs to disable (no spaces, ``?`` to list available RPCs). diff --git a/qga/main.c b/qga/main.c index 249fe06e8e5..66177b9e93d 100644 --- a/qga/main.c +++ b/qga/main.c @@ -257,7 +257,8 @@ QEMU_COPYRIGHT "\n" #ifdef _WIN32 " -s, --service service commands: install, uninstall, vss-install, vs= s-uninstall\n" #endif -" -b, --blacklist comma-separated list of RPCs to disable (no spaces, \= "?\"\n" +" --blacklist backward compatible alias for --denylist (deprecated)= \n" +" -b, --denylist comma-separated list of RPCs to disable (no spaces, \= "?\"\n" " to list available RPCs)\n" " -D, --dump-conf dump a qemu-ga config file based on current config\n" " options / command-line parameters to stdout\n" @@ -1111,7 +1112,8 @@ static void config_parse(GAConfig *config, int argc, = char **argv) { "method", 1, NULL, 'm' }, { "path", 1, NULL, 'p' }, { "daemonize", 0, NULL, 'd' }, - { "blacklist", 1, NULL, 'b' }, + { "denylist", 1, NULL, 'b' }, + { "blacklist", 1, NULL, 'b' }, /* deprecated alias for 'denylist' = */ #ifdef _WIN32 { "service", 1, NULL, 's' }, #endif --=20 2.26.2 From nobody Tue Nov 18 18:19:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612299545; cv=none; d=zohomail.com; s=zohoarc; b=my6CA+BF3E437lDTaaoEXCVeT7hZb7qYm+NtM5C91jQ39ilYnal7drDgWjF3j7aXPFLZXx1ZPt0wZnH/LTH5DlX/J7Q02bIOjcipOodxy1J807EhtVoJ44sOm8/orltvAaxqtd+zF9ZByLJP+ajjLGxtsxPqyFFtZKX0l1hEs4Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612299545; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=KikifyMD+kQLStcGOLcsV8rDvJsrpQTJUnw3tvpYxvk=; b=gjn5Acq8NWyK9oD+p6AfP/SPvCV4FChDgaY0CnDJCbdEAaw2EiUA+dL9Qfb7A+ZDLME5R1Jt93y9EG0NFylQYTt2jg4Z5sHba+jy1YV+sqtHdnT4YoDU92bf5scsPHQfBWkfBHTPNPCZcVzkIlp72ijokQpQs2XDyemW4lqftVY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612299545960146.5687310181312; Tue, 2 Feb 2021 12:59:05 -0800 (PST) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-515-3gKPhDunNTykjivKRbS78w-1; Tue, 02 Feb 2021 15:59:03 -0500 Received: by mail-ej1-f70.google.com with SMTP id w16so3054889ejk.7 for ; Tue, 02 Feb 2021 12:59:03 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id lf26sm14021ejb.4.2021.02.02.12.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:59:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612299544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KikifyMD+kQLStcGOLcsV8rDvJsrpQTJUnw3tvpYxvk=; b=IJWD98FbVVUdt7N6xg8I/xZCA+h1CnP8lWPuipPKZg2YtCHOwXzoem/gS9vVlL/dIy1PhS UoUHSVBF4l1xM6Tk2uChw0N4hcFGZOg41+iHCbL9D2wZ50POXyXO1L2fWii515GhTazbxt xfSSTytFGNJz1rfMzP2QsMNBdklJ+eA= X-MC-Unique: 3gKPhDunNTykjivKRbS78w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KikifyMD+kQLStcGOLcsV8rDvJsrpQTJUnw3tvpYxvk=; b=CbFpHSBS9aGshHp/RRA3+SOvyRi1m7Mg3jPzvcEoxFzltdCP6OCiOUuptKMxcd5IbF oMkBwWMttL2htKzsZ7ggZrSh95BGW24adOtazarfDBPSjkI7wtxxpJyM2yuH8VFJcyU3 F2VGN7hH0Nw11jVtNLJTnNKhvPP4Xtqu3w7eDrsA8SjFge7G5rVlyALHUzdzDGbUY5zB PBT6Mr74S2qD+jkcKk1I8855YpyLPdYi2xkzKdOxkNyz2CHfmLvihrKStjLBVzPD2UFg mHUXQ1/W/veStuGa3L0NKdq6bqrbv3iGHE7ovQBnCfll2VvuSgwy6uYi7omQeQtr/kuk drVg== X-Gm-Message-State: AOAM532BTsuV4++pPwMqOFSHK1biWaltv6Uf/pTpvJuxLfq0Ady4tJ1L pd7m1GJ1nOKOQhlPcmolTiRN6e9nCgicY6JACwFc/9pU7YQu+i5Rxo5hs2e3BUlsP17+io8UMZj GQs6QbkegcldiwA== X-Received: by 2002:aa7:cdc8:: with SMTP id h8mr748993edw.244.1612299541994; Tue, 02 Feb 2021 12:59:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzIjaVmtpm/x/R+xleXJRRxdttHpz9X6lFS42uaEjDXUK/fg1Fxb7Ic8OsxZQC9bonU1hr1Lg== X-Received: by 2002:aa7:cdc8:: with SMTP id h8mr748984edw.244.1612299541828; Tue, 02 Feb 2021 12:59:01 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Dr. David Alan Gilbert" , Eduardo Otubo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , Aurelien Jarno , qemu-block@nongnu.org, Kevin Wolf , Michael Roth , Peter Maydell , Alex Williamson , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 04/12] qga: Replace the word 'blacklist' Date: Tue, 2 Feb 2021 21:58:16 +0100 Message-Id: <20210202205824.1085853-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210202205824.1085853-1-philmd@redhat.com> References: <20210202205824.1085853-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- qga/guest-agent-core.h | 2 +- qga/commands-posix.c | 14 +++++------ qga/commands-win32.c | 10 ++++---- qga/main.c | 57 +++++++++++++++++++++--------------------- 4 files changed, 42 insertions(+), 41 deletions(-) diff --git a/qga/guest-agent-core.h b/qga/guest-agent-core.h index 9d01ea9c82a..90ce6a91a0a 100644 --- a/qga/guest-agent-core.h +++ b/qga/guest-agent-core.h @@ -24,7 +24,7 @@ typedef struct GACommandState GACommandState; extern GAState *ga_state; extern QmpCommandList ga_commands; =20 -GList *ga_command_blacklist_init(GList *blacklist); +GList *ga_command_denylist_init(GList *denylist); void ga_command_state_init(GAState *s, GACommandState *cs); void ga_command_state_add(GACommandState *cs, void (*init)(void), diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 8dd94a33144..a23f11d9d20 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -3071,8 +3071,8 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum, E= rror **errp) } #endif =20 -/* add unsupported commands to the blacklist */ -GList *ga_command_blacklist_init(GList *blacklist) +/* add unsupported commands to the denylist */ +GList *ga_command_denylist_init(GList *denylist) { #if !defined(__linux__) { @@ -3086,7 +3086,7 @@ GList *ga_command_blacklist_init(GList *blacklist) char **p =3D (char **)list; =20 while (*p) { - blacklist =3D g_list_append(blacklist, g_strdup(*p++)); + denylist =3D g_list_append(denylist, g_strdup(*p++)); } } #endif @@ -3101,18 +3101,18 @@ GList *ga_command_blacklist_init(GList *blacklist) char **p =3D (char **)list; =20 while (*p) { - blacklist =3D g_list_append(blacklist, g_strdup(*p++)); + denylist =3D g_list_append(denylist, g_strdup(*p++)); } } #endif =20 #if !defined(CONFIG_FSTRIM) - blacklist =3D g_list_append(blacklist, g_strdup("guest-fstrim")); + denylist =3D g_list_append(denylist, g_strdup("guest-fstrim")); #endif =20 - blacklist =3D g_list_append(blacklist, g_strdup("guest-get-devices")); + denylist =3D g_list_append(denylist, g_strdup("guest-get-devices")); =20 - return blacklist; + return denylist; } =20 /* register init/cleanup routines for stateful command groups */ diff --git a/qga/commands-win32.c b/qga/commands-win32.c index a00e6cb1655..f7a1644a423 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -2004,8 +2004,8 @@ GuestMemoryBlockInfo *qmp_guest_get_memory_block_info= (Error **errp) return NULL; } =20 -/* add unsupported commands to the blacklist */ -GList *ga_command_blacklist_init(GList *blacklist) +/* add unsupported commands to the denylist */ +GList *ga_command_denylist_init(GList *denylist) { const char *list_unsupported[] =3D { "guest-suspend-hybrid", @@ -2016,7 +2016,7 @@ GList *ga_command_blacklist_init(GList *blacklist) char **p =3D (char **)list_unsupported; =20 while (*p) { - blacklist =3D g_list_append(blacklist, g_strdup(*p++)); + denylist =3D g_list_append(denylist, g_strdup(*p++)); } =20 if (!vss_init(true)) { @@ -2027,11 +2027,11 @@ GList *ga_command_blacklist_init(GList *blacklist) p =3D (char **)list; =20 while (*p) { - blacklist =3D g_list_append(blacklist, g_strdup(*p++)); + denylist =3D g_list_append(denylist, g_strdup(*p++)); } } =20 - return blacklist; + return denylist; } =20 /* register init/cleanup routines for stateful command groups */ diff --git a/qga/main.c b/qga/main.c index 66177b9e93d..4dbcc62ac9d 100644 --- a/qga/main.c +++ b/qga/main.c @@ -88,7 +88,7 @@ struct GAState { #endif bool delimit_response; bool frozen; - GList *blacklist; + GList *denylist; char *state_filepath_isfrozen; struct { const char *log_filepath; @@ -108,7 +108,7 @@ struct GAState *ga_state; QmpCommandList ga_commands; =20 /* commands that are safe to issue while filesystems are frozen */ -static const char *ga_freeze_whitelist[] =3D { +static const char *ga_freeze_allowlist[] =3D { "guest-ping", "guest-info", "guest-sync", @@ -362,31 +362,31 @@ static gint ga_strcmp(gconstpointer str1, gconstpoint= er str2) } =20 /* disable commands that aren't safe for fsfreeze */ -static void ga_disable_non_whitelisted(const QmpCommand *cmd, void *opaque) +static void ga_disable_not_allowed(const QmpCommand *cmd, void *opaque) { - bool whitelisted =3D false; + bool allowed =3D false; int i =3D 0; const char *name =3D qmp_command_name(cmd); =20 - while (ga_freeze_whitelist[i] !=3D NULL) { - if (strcmp(name, ga_freeze_whitelist[i]) =3D=3D 0) { - whitelisted =3D true; + while (ga_freeze_allowlist[i] !=3D NULL) { + if (strcmp(name, ga_freeze_allowlist[i]) =3D=3D 0) { + allowed =3D true; } i++; } - if (!whitelisted) { + if (!allowed) { g_debug("disabling command: %s", name); qmp_disable_command(&ga_commands, name); } } =20 -/* [re-]enable all commands, except those explicitly blacklisted by user */ -static void ga_enable_non_blacklisted(const QmpCommand *cmd, void *opaque) +/* [re-]enable all commands, except those explicitly denylisted by user */ +static void ga_enable_non_denylisted(const QmpCommand *cmd, void *opaque) { - GList *blacklist =3D opaque; + GList *denylist =3D opaque; const char *name =3D qmp_command_name(cmd); =20 - if (g_list_find_custom(blacklist, name, ga_strcmp) =3D=3D NULL && + if (g_list_find_custom(denylist, name, ga_strcmp) =3D=3D NULL && !qmp_command_is_enabled(cmd)) { g_debug("enabling command: %s", name); qmp_enable_command(&ga_commands, name); @@ -425,8 +425,8 @@ void ga_set_frozen(GAState *s) if (ga_is_frozen(s)) { return; } - /* disable all non-whitelisted (for frozen state) commands */ - qmp_for_each_command(&ga_commands, ga_disable_non_whitelisted, NULL); + /* disable all commands not allowed (for frozen state) */ + qmp_for_each_command(&ga_commands, ga_disable_not_allowed, NULL); g_warning("disabling logging due to filesystem freeze"); ga_disable_logging(s); s->frozen =3D true; @@ -464,8 +464,8 @@ void ga_unset_frozen(GAState *s) s->deferred_options.pid_filepath =3D NULL; } =20 - /* enable all disabled, non-blacklisted commands */ - qmp_for_each_command(&ga_commands, ga_enable_non_blacklisted, s->black= list); + /* enable all disabled, non-denylisted commands */ + qmp_for_each_command(&ga_commands, ga_enable_non_denylisted, s->denyli= st); s->frozen =3D false; if (!ga_delete_file(s->state_filepath_isfrozen)) { g_warning("unable to delete %s, fsfreeze may not function properly= ", @@ -896,9 +896,10 @@ int64_t ga_get_fd_handle(GAState *s, Error **errp) int64_t handle; =20 g_assert(s->pstate_filepath); - /* we blacklist commands and avoid operations that potentially require - * writing to disk when we're in a frozen state. this includes opening - * new files, so we should never get here in that situation + /* + * We have commands in a denylist and avoid operations that potentially + * require writing to disk when we're in a frozen state. this includes + * opening new files, so we should never get here in that situation */ g_assert(!ga_is_frozen(s)); =20 @@ -950,8 +951,8 @@ struct GAConfig { #ifdef _WIN32 const char *service; #endif - gchar *bliststr; /* blacklist may point to this string */ - GList *blacklist; + gchar *bliststr; /* denylist may point to this string */ + GList *denylist; int daemonize; GLogLevelFlags log_level; int dumpconf; @@ -1171,7 +1172,7 @@ static void config_parse(GAConfig *config, int argc, = char **argv) qmp_for_each_command(&ga_commands, ga_print_cmd, NULL); exit(EXIT_SUCCESS); } - config->blacklist =3D g_list_concat(config->blacklist, + config->denylist =3D g_list_concat(config->denylist, split_list(optarg, ",")); break; } @@ -1226,7 +1227,7 @@ static void config_free(GAConfig *config) #ifdef CONFIG_FSFREEZE g_free(config->fsfreeze_hook); #endif - g_list_free_full(config->blacklist, g_free); + g_list_free_full(config->denylist, g_free); g_free(config); } =20 @@ -1308,7 +1309,7 @@ static GAState *initialize_agent(GAConfig *config, in= t socket_activation) s->deferred_options.log_filepath =3D config->log_filepath; } ga_disable_logging(s); - qmp_for_each_command(&ga_commands, ga_disable_non_whitelisted, NUL= L); + qmp_for_each_command(&ga_commands, ga_disable_not_allowed, NULL); } else { if (config->daemonize) { become_daemon(config->pid_filepath); @@ -1332,10 +1333,10 @@ static GAState *initialize_agent(GAConfig *config, = int socket_activation) return NULL; } =20 - config->blacklist =3D ga_command_blacklist_init(config->blacklist); - if (config->blacklist) { - GList *l =3D config->blacklist; - s->blacklist =3D config->blacklist; + config->denylist =3D ga_command_denylist_init(config->denylist); + if (config->denylist) { + GList *l =3D config->denylist; + s->denylist =3D config->denylist; do { g_debug("disabling command: %s", (char *)l->data); qmp_disable_command(&ga_commands, l->data); --=20 2.26.2 From nobody Tue Nov 18 18:19:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612299551; cv=none; d=zohomail.com; s=zohoarc; b=BpfvcUMJiMj0Cyac+Wd3UjvOUVdwm/zck9C+K3jUTgcLmf2Ab8iEVcDqBv8Zp5qWc3vFc7kEi/hq3G33t6he5Dfho4mIxV/45vk+kLaXYDLKCYIXAjCLvZeoDPWtWuUze4BG4Y4MGEL/nHmnQ2Mez2PuFy12Dh6ZLKdmRF2Ctq4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612299551; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Zr5wlPqSBAErI1zYjHx4DGcwT+gbzmViuOOQn3eQ5nU=; b=Wu5oVF3cNLXTkEeo2g9ZmEG6JeBCgB0C9ajFvDP9qXKGOZlBpNFk6ApbaJZ9BlufcHYMwFqrrJxYVHsacz4ouzkz+zAyx/ovEYkgiKz5JvJdjDNFqNUGF8HRGKWyFD2Ly96+xjE1MnhIHfeXSIFn9u68lW50F8P48Gl/SaXQYEQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612299551539855.6023855329111; Tue, 2 Feb 2021 12:59:11 -0800 (PST) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-142-A_m4A0m7Nz2KFo3DQ5alHw-1; Tue, 02 Feb 2021 15:59:08 -0500 Received: by mail-ed1-f70.google.com with SMTP id ay16so1341595edb.2 for ; Tue, 02 Feb 2021 12:59:08 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id b1sm12197eju.15.2021.02.02.12.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:59:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612299550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Zr5wlPqSBAErI1zYjHx4DGcwT+gbzmViuOOQn3eQ5nU=; b=gRzNe2DRS+M0nBDhC8DcFAbu4Xt2EzYifIp1RMufftX2YzUihcPb6aaaqIR7P7NQ0NEjPp EodKXbyIJ4b0ZgOjHvE2rgvFt6Dnp0KGFfmsyqBTJwFLKF0AGAW5X7vye1zBBYlXom0x9N Fei53ie6V42+q+PrekOmOuH1maitEGE= X-MC-Unique: A_m4A0m7Nz2KFo3DQ5alHw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Zr5wlPqSBAErI1zYjHx4DGcwT+gbzmViuOOQn3eQ5nU=; b=LB2NeESFaMBMbziMZUM/HO7ym1aZMSkdABNc5Okm+ZxiJM9XjCAJ7G1SaBlTGYki5k wfS49xBu3ywrbKgeu2SmT890Z+gUr+7dEq/mnU003jJPP+UfQvEPdWOAXQ7XVBEgFiZu DFf0hFEg05AoKuWFOYh5ax+V0TULvnowRkWw0CSWUZAwdZsX6nRjRAqpMQvWp1hFQGD2 rE+CYM59S7y54p7c320y0I+jEdSYIZJip2DPNi2M9SKcZwjZePDcN/HEC0QBZbXwi90s amv88290A1cVcvKSF1W0AXt3nyATm2w/qbXQoMnBSdQNjCELJa8uciTGE5ZQno9z1944 PM2A== X-Gm-Message-State: AOAM530zym8ahs1KdFyEHcgwoy9/MKfrG3dNx2OVSU1kWOuZXdnekrZx tmsYvt9PXMuHuSgiir/hLUt6s9FW8QI8obrr01SaQ+PZq8ELT+9VUHUerhHxsP91IxmIT11H6Lw 4bjxRXtzhvlHcBw== X-Received: by 2002:a05:6402:26d3:: with SMTP id x19mr3427edd.0.1612299547678; Tue, 02 Feb 2021 12:59:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJzL+z53Vv/o3ibh8w3bBxjCI6htGchO9ok3XyqBAXpPxadZKvFGzM1UiGQcX6+0BX7J2BHqkg== X-Received: by 2002:a05:6402:26d3:: with SMTP id x19mr3408edd.0.1612299547532; Tue, 02 Feb 2021 12:59:07 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Dr. David Alan Gilbert" , Eduardo Otubo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , Aurelien Jarno , qemu-block@nongnu.org, Kevin Wolf , Michael Roth , Peter Maydell , Alex Williamson , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 05/12] tools/virtiofsd: Replace the word 'whitelist' Date: Tue, 2 Feb 2021 21:58:17 +0100 Message-Id: <20210202205824.1085853-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210202205824.1085853-1-philmd@redhat.com> References: <20210202205824.1085853-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Dr. David Alan Gilbert --- tools/virtiofsd/passthrough_ll.c | 6 +++--- tools/virtiofsd/passthrough_seccomp.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 5fb36d94074..4bf86d44211 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -3132,7 +3132,7 @@ static void setup_mounts(const char *source) } =20 /* - * Only keep whitelisted capabilities that are needed for file system oper= ation + * Only keep capabilities in allowlist that are needed for file system ope= ration * The (possibly NULL) modcaps_in string passed in is free'd before exit. */ static void setup_capabilities(char *modcaps_in) @@ -3142,8 +3142,8 @@ static void setup_capabilities(char *modcaps_in) capng_restore_state(&cap.saved); =20 /* - * Whitelist file system-related capabilities that are needed for a fi= le - * server to act like root. Drop everything else like networking and + * Add to allowlist file system-related capabilities that are needed f= or a + * file server to act like root. Drop everything else like networking= and * sysadmin capabilities. * * Exclusions: diff --git a/tools/virtiofsd/passthrough_seccomp.c b/tools/virtiofsd/passth= rough_seccomp.c index a60d7da4b4e..c8b1ebbe830 100644 --- a/tools/virtiofsd/passthrough_seccomp.c +++ b/tools/virtiofsd/passthrough_seccomp.c @@ -21,7 +21,7 @@ #endif #endif =20 -static const int syscall_whitelist[] =3D { +static const int syscall_allowlist[] =3D { /* TODO ireg sem*() syscalls */ SCMP_SYS(brk), SCMP_SYS(capget), /* For CAP_FSETID */ @@ -115,12 +115,12 @@ static const int syscall_whitelist[] =3D { }; =20 /* Syscalls used when --syslog is enabled */ -static const int syscall_whitelist_syslog[] =3D { +static const int syscall_allowlist_syslog[] =3D { SCMP_SYS(send), SCMP_SYS(sendto), }; =20 -static void add_whitelist(scmp_filter_ctx ctx, const int syscalls[], size_= t len) +static void add_allowlist(scmp_filter_ctx ctx, const int syscalls[], size_= t len) { size_t i; =20 @@ -151,10 +151,10 @@ void setup_seccomp(bool enable_syslog) exit(1); } =20 - add_whitelist(ctx, syscall_whitelist, G_N_ELEMENTS(syscall_whitelist)); + add_allowlist(ctx, syscall_allowlist, G_N_ELEMENTS(syscall_allowlist)); if (enable_syslog) { - add_whitelist(ctx, syscall_whitelist_syslog, - G_N_ELEMENTS(syscall_whitelist_syslog)); + add_allowlist(ctx, syscall_allowlist_syslog, + G_N_ELEMENTS(syscall_allowlist_syslog)); } =20 /* libvhost-user calls this for post-copy migration, we don't need it = */ --=20 2.26.2 From nobody Tue Nov 18 18:19:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612299558; cv=none; d=zohomail.com; s=zohoarc; b=nyI0QWlwy6caNf1ePkXAIyEQ0zi5c9uodWOowl5OfGOcklqIok4zDSIFHW35ETWOpkneBKir/rwoGuxOBmc1fGx1F1fKqTWImW4qlJsM9sFNosT/LQVP3w++EzBL5OyvRsor0R/OvQMNB4gibe/ggrij9P0Cto31V/CbaRgGqtE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612299558; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=eRNuuWWnGzS751tz77gVwZLSy3CEk47CqPxoZeCkviw=; b=aOtAHH25CFjbKx+9qn3bKL4K4RmAxKmVuzFbBTTlkaCQVB9sCMBxymfE6FuF44HX1bbwYrt9RNg2fUeB/5C9XNDCQIHeW4X1r8ZNK7P279LJgk+CYUW6WngqrvLzAM3VrMlVdeaWfBjCq8efuDu0wENIqxcH+Nr4Arrqk6SBGnM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612299558335254.86564006022923; Tue, 2 Feb 2021 12:59:18 -0800 (PST) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-524-mzR0FtWYNbGRpcBLcSJl3A-1; Tue, 02 Feb 2021 15:59:15 -0500 Received: by mail-ed1-f71.google.com with SMTP id p18so424346edr.20 for ; Tue, 02 Feb 2021 12:59:15 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id g4sm1215549edv.59.2021.02.02.12.59.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:59:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612299557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eRNuuWWnGzS751tz77gVwZLSy3CEk47CqPxoZeCkviw=; b=VMUNFS/KoVL3GaOoou1jZJYwou5uuul2Uz0YshA8QDeq68nIiBE9GIAnspKlRQ//tcvo6X 9K67i3JrKBVINKfw/TrNae4Tw5+QwlDlx3LSdh4ezq0JaABmlfYS7k+PtdK+kqdfsxYdJa XzVG/eBTPmM40ze85xWHVZjjT3WDkJA= X-MC-Unique: mzR0FtWYNbGRpcBLcSJl3A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eRNuuWWnGzS751tz77gVwZLSy3CEk47CqPxoZeCkviw=; b=iByoVy9UOVYkoo8GVbB0u/vxrUNJVHRSgkltjSnLkHjgkLJswmnzNUrTuTSVLlTbz4 07NF1zVeWHLoz53rsSkY+O7V0nHDiftRfiFpn+dqLkgAePpaLWuXtTYKyO6kYxXGiDwi nTEK7gPSsaIJHjijWsFJn5yDLkti4MoWhC2w+dED7o7XgW33OLm1T+DiN9IUfwxtd/F1 CGzJRt8frq+NA1+HOQVIs4E0+9eZNbxORYA9OJhks+BpDa2FuZDXNzONT6sq/XSgV23F PNLsg0z8u09gR7qNFDfVbyDeYv2llpPfy5MM1GEmcs6DaqRizzyPuFfZyLVhjOUsmrvT OBAA== X-Gm-Message-State: AOAM530R4rDTjfh9kSbGpmuBgBoE7QUY4KuD2d4qEBxJExOJxUmZVFDr u5fHi76Jclg4ibXCesZSGc0xqLqVPAs+x3inV6oCnneB4ioZ5lUSzPD7qbSYKO9dAk3iWlvVfus jN3T1y9Y56WGCsw== X-Received: by 2002:a17:906:2a8b:: with SMTP id l11mr23958937eje.1.1612299554280; Tue, 02 Feb 2021 12:59:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJxE/WXY7pnoMkxWO2IgrEqk3qYmnF/l7DPVszzBT8rQjJvRYIhfJ0lW//xnXZ8l83sldEueWQ== X-Received: by 2002:a17:906:2a8b:: with SMTP id l11mr23958931eje.1.1612299554148; Tue, 02 Feb 2021 12:59:14 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Dr. David Alan Gilbert" , Eduardo Otubo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , Aurelien Jarno , qemu-block@nongnu.org, Kevin Wolf , Michael Roth , Peter Maydell , Alex Williamson , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 06/12] scripts/tracetool: Replace the word 'whitelist' Date: Tue, 2 Feb 2021 21:58:18 +0100 Message-Id: <20210202205824.1085853-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210202205824.1085853-1-philmd@redhat.com> References: <20210202205824.1085853-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Stefan Hajnoczi --- 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 =3D=3D "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 " --=20 2.26.2 From nobody Tue Nov 18 18:19:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612299563; cv=none; d=zohomail.com; s=zohoarc; b=ZO78PgONVwTicDJeni1/5E8uZUqjQv+W9UsG4PLLeBTRyLpaGGCBpUmCbn+5pklJmor5aeB0Igop/dfjwkBDEJgCemwu0Iw3XGRpXfbC27BPnJAvCfXJlHBXyfmMiVEUGEVmIVgCQSIkoD5O33Tq+5Hgym+PMc78dNFUHRgbHWQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612299563; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=ND9ZC1FHVt0d7eciPZVn1MRDtBcHT7RVOlI71H770Mo=; b=euuhw4qdxmv1fXDV2jWpLAsHxcpiGxZsI5QQxFUTo1A63+xr4pqcBaXYSQf2qDLMAFsn9W48VDDi/5wSb86oN8KeTpe3DyncPVrhXKRNyG+upLZJu8p6PQJNyp0f26anhiyE9XDHSIOcRvA5PyEuuBfRwe7nFV3+H04tgsJMhW8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612299563784179.61663242113377; Tue, 2 Feb 2021 12:59:23 -0800 (PST) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-255-RVxv5TimNga3n62M6UF06A-1; Tue, 02 Feb 2021 15:59:21 -0500 Received: by mail-ed1-f69.google.com with SMTP id i13so4221536edq.19 for ; Tue, 02 Feb 2021 12:59:21 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id lz12sm3436ejb.71.2021.02.02.12.59.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:59:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612299562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ND9ZC1FHVt0d7eciPZVn1MRDtBcHT7RVOlI71H770Mo=; b=XfjaFdhB5w9zgtYFho3mecuSNjqlrrzDHXe7EZyekXIaCRIFspFbIrhdUoAHNBraOvsttb ekhHZqV+RnwXSFxpRd0O+tFum8dnKJOZThYk5CDPxPS33YPUrk7xkkq7VOvqAXxQklIjV2 ABdDvTw2rAZbnF/dKaVIYOsZzliCnNw= X-MC-Unique: RVxv5TimNga3n62M6UF06A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ND9ZC1FHVt0d7eciPZVn1MRDtBcHT7RVOlI71H770Mo=; b=aIfMfqZ6Rh174VBh8/i4i8bDebXsa0Cde6Tj8Uex2WUfLF0ydCZK7V6XwJlShcVLRo h8AE6K0Mq1AfUq5i8ipWU8mCRsh2RWBvgi1y0FTCbz6glTP6qu/KwKX6XOlqjQmy6oCB w+NWxQAOEy+c79Umv8Isz8Ln6TS0rTYrk394oIj95Px3Wfg3eVtTc/f47z+lSkEQW2ht inDUhD3hLidYSWmqi3BLhIVT2tZlVr6d5rsK2SX6gccPVdbHPrF0AUfCiYPKJIzp+FaV twTMnhOqhLnndIYqcI+skaIteHdrmGL3ZTlW0p0GTtX9VL7dXtFoZJdFJ1uft+NQioJ2 sQfQ== X-Gm-Message-State: AOAM533j7rFakMrUnjxyVPoWUbp31c5rQ/CIYHCaDO9ExN178Ua/0tOR w2CbRrAx468SuZxSsQ9XjNGpDwvzkp2HuUmAXR0ZX+/+mNxXHAOd95Aft1A4oBmoNITAia/mU65 DEYu8b0SV83D4sQ== X-Received: by 2002:a17:906:1c11:: with SMTP id k17mr12127657ejg.70.1612299560073; Tue, 02 Feb 2021 12:59:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJzc66eDSSH+BNcm5+dNYek0/hknrIf+zCDC3iL5UggY339OUoxodhKrOYqWwBngv8T0oBxHgg== X-Received: by 2002:a17:906:1c11:: with SMTP id k17mr12127633ejg.70.1612299559816; Tue, 02 Feb 2021 12:59:19 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Dr. David Alan Gilbert" , Eduardo Otubo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , Aurelien Jarno , qemu-block@nongnu.org, Kevin Wolf , Michael Roth , Peter Maydell , Alex Williamson , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 07/12] scripts/device-crash-test: Replace the word 'whitelist' Date: Tue, 2 Feb 2021 21:58:19 +0100 Message-Id: <20210202205824.1085853-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210202205824.1085853-1-philmd@redhat.com> References: <20210202205824.1085853-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Follow the inclusive terminology from the "Conscious Language in your Open Source Projects" guidelines [*] and replace the word "whitelist" appropriately. [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- scripts/device-crash-test | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/device-crash-test b/scripts/device-crash-test index 04118669ba7..6812de42f8c 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -41,18 +41,18 @@ logger =3D logging.getLogger('device-crash-test') dbg =3D logger.debug =20 =20 -# Purposes of the following whitelist: +# Purposes of the following allowlist: # * Avoiding verbose log messages when we find known non-fatal # (exitcode=3D1) errors # * Avoiding fatal errors when we find known crashes # * Skipping machines/devices that are known not to work out of # the box, when running in --quick mode # -# Keeping the whitelist updated is desirable, but not required, +# Keeping the allowlist updated is desirable, but not required, # because unexpected cases where QEMU exits with exitcode=3D1 will # just trigger a INFO message. =20 -# Valid whitelist entry keys: +# Valid allowlist entry keys: # * accel: regexp, full match only # * machine: regexp, full match only # * device: regexp, full match only @@ -62,7 +62,7 @@ dbg =3D logger.debug # * expected: if True, QEMU is expected to always fail every time # when testing the corresponding test case # * loglevel: log level of log output when there's a match. -ERROR_WHITELIST =3D [ +ERROR_ALLOWLIST =3D [ # Machines that won't work out of the box: # MACHINE | ERROR MESSAGE {'machine':'niagara', 'expected':True}, # Unable to load a firmw= are for -M niagara @@ -187,9 +187,9 @@ ERROR_WHITELIST =3D [ =20 =20 def whitelistTestCaseMatch(wl, t): - """Check if a test case specification can match a whitelist entry + """Check if a test case specification can match a allowlist entry =20 - This only checks if a whitelist entry is a candidate match + This only checks if a allowlist entry is a candidate match for a given test case, it won't check if the test case results/output match the entry. See whitelistResultMatch(). """ @@ -206,16 +206,16 @@ def whitelistTestCaseMatch(wl, t): =20 def whitelistCandidates(t): """Generate the list of candidates that can match a test case""" - for i, wl in enumerate(ERROR_WHITELIST): + for i, wl in enumerate(ERROR_ALLOWLIST): if whitelistTestCaseMatch(wl, t): yield (i, wl) =20 =20 def findExpectedResult(t): - """Check if there's an expected=3DTrue whitelist entry for a test case + """Check if there's an expected=3DTrue allowlist entry for a test case =20 Returns (i, wl) tuple, where i is the index in - ERROR_WHITELIST and wl is the whitelist entry itself. + ERROR_ALLOWLIST and wl is the allowlist entry itself. """ for i, wl in whitelistCandidates(t): if wl.get('expected'): @@ -223,7 +223,7 @@ def findExpectedResult(t): =20 =20 def whitelistResultMatch(wl, r): - """Check if test case results/output match a whitelist entry + """Check if test case results/output match a allowlist entry =20 It is valid to call this function only if whitelistTestCaseMatch() is True for the entry (e.g. on @@ -237,10 +237,10 @@ def whitelistResultMatch(wl, r): =20 =20 def checkResultWhitelist(r): - """Look up whitelist entry for a given test case result + """Look up allowlist entry for a given test case result =20 Returns (i, wl) tuple, where i is the index in - ERROR_WHITELIST and wl is the whitelist entry itself. + ERROR_ALLOWLIST and wl is the allowlist entry itself. """ for i, wl in whitelistCandidates(r['testcase']): if whitelistResultMatch(wl, r): @@ -544,7 +544,7 @@ def main(): =20 if f: i, wl =3D checkResultWhitelist(f) - dbg("testcase: %r, whitelist match: %r", t, wl) + dbg("testcase: %r, allowlist match: %r", t, wl) wl_stats.setdefault(i, []).append(f) level =3D wl.get('loglevel', logging.DEBUG) logFailure(f, level) @@ -561,9 +561,9 @@ def main(): =20 if args.debug: stats =3D sorted([(len(wl_stats.get(i, [])), wl) for i, wl in - enumerate(ERROR_WHITELIST)], key=3Dlambda x: x[0]) + enumerate(ERROR_ALLOWLIST)], key=3Dlambda x: x[0]) for count, wl in stats: - dbg("whitelist entry stats: %d: %r", count, wl) + dbg("allowlist entry stats: %d: %r", count, wl) =20 if fatal_failures: for f in fatal_failures: --=20 2.26.2 From nobody Tue Nov 18 18:19:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612299570; cv=none; d=zohomail.com; s=zohoarc; b=KOwpGJ7DdfvN1wezS3xZn9EWToGcQ+998G7+Ra7lcMLzU6BM1blYZ2FKoPPz1hG0KDjZvjAmyB3uOjKVwRCS1x0EE/mGThM977+eOCXhUSMCUFGzWpv5DrZAH+RvuOlR+hWGWHFYO/I7qM+xdwKgKYONPVMv/8Yu9i4BjxFZmAc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612299570; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=2uRkOC0iQiO30r3cMD7qB5pIME7EIhrWLL7nKiab9bA=; b=GEcSso8OPjadKCP157Y9TNBDPru932lmEa4z+3u1kroVwdKjduAh/YDCx2VhyZAM7d2oYPglYtLeOO9Ylt3kapKn6iJSkbayKlw64NL7J9Yd7QAFKNUCFao5jpu6/WV+04UnPJ3idBH1AuJYcRzNCOLPCbxi8tQZMQmS76l7rn4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612299570243531.2248004291886; Tue, 2 Feb 2021 12:59:30 -0800 (PST) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-60-bIILvKE2MCiWHJZz_EpVXw-1; Tue, 02 Feb 2021 15:59:26 -0500 Received: by mail-ej1-f72.google.com with SMTP id ce9so1258602ejc.17 for ; Tue, 02 Feb 2021 12:59:26 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id w8sm9530415edd.39.2021.02.02.12.59.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:59:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612299568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2uRkOC0iQiO30r3cMD7qB5pIME7EIhrWLL7nKiab9bA=; b=cp3z2b665sSHswirYOGDPMDQZAT/7ROPWNz98E2pZxgJA9PV06bGL7NdAqQt4n9an6Dqvr nIkjMmrsoQd2Qbqnv8k+eYAQwIeK35T1DXMeO+BosvDkhRoAnH2YdYYoIxPkBPmBj1kCRq brbtMW80fp7LS8wTLLmGds4CMmiM8sw= X-MC-Unique: bIILvKE2MCiWHJZz_EpVXw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2uRkOC0iQiO30r3cMD7qB5pIME7EIhrWLL7nKiab9bA=; b=SeE0SVFAYnvp7sRWOoJPUQZz/IaOdlSho/Y806xy7cF+UFnHBlCFsGmuvGo9UcA/Je ZLz7eHjTo9pVA8lU0oGIlDyu99DIwd0QYZDo6+bTYoZoA1Kw7usffRUJqTbHzQhYAqJh /memHcvXnW3Xt+K6ic5xJgcw39nz1QdbNiYbfe8zSR1Qvs+3kPAiaivt7Ouun1VXoAn8 7OcGMJcjz2pb5FL4GQmr9MbvIvIPQxw1mZVUYc2Cy5aOgimDDSodYYviyUW+3Hee6HEN c9AIhyqp2kKmp0QjukrQQ6LYs0pSNX93T6Bbkx5sPm/9VS+BKl7AXZfVQPgPev/HkZPp B/zQ== X-Gm-Message-State: AOAM530zd4OFRLiDjtifT3gI63MhVeT1MxzCtbML/+PnLpbsYsaVCTgQ yN4Y57T+HQWyBfGUo5kS91QEmDuOg4PvhUXIvA8en8s2sK/B+g/Aru3Ce7V2F+uj8l5jf1GVoNd JvaCGnANNdjmcBA== X-Received: by 2002:a50:acc1:: with SMTP id x59mr723552edc.43.1612299565578; Tue, 02 Feb 2021 12:59:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJyV+hZ1g/jXNPyKi8KquZsEFJD/96hNNdP2T4tm5/D31fwggm44iPA6t+qfzwPYGDl0woV3jQ== X-Received: by 2002:a50:acc1:: with SMTP id x59mr723536edc.43.1612299565447; Tue, 02 Feb 2021 12:59:25 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Dr. David Alan Gilbert" , Eduardo Otubo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , Aurelien Jarno , qemu-block@nongnu.org, Kevin Wolf , Michael Roth , Peter Maydell , Alex Williamson , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 08/12] seccomp: Replace the word 'blacklist' Date: Tue, 2 Feb 2021 21:58:20 +0100 Message-Id: <20210202205824.1085853-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210202205824.1085853-1-philmd@redhat.com> References: <20210202205824.1085853-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Eduardo Otubo Reviewed-by: Daniel P. Berrang=C3=A9 --- 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..4c684bc9e71 100644 --- a/softmmu/qemu-seccomp.c +++ b/softmmu/qemu-seccomp.c @@ -45,8 +45,8 @@ const struct scmp_arg_cmp sched_setscheduler_arg[] =3D { { .arg =3D 1, .op =3D SCMP_CMP_NE, .datum_a =3D SCHED_IDLE } }; =20 -static const struct QemuSeccompSyscall blacklist[] =3D { - /* default set of syscalls to blacklist */ +static const struct QemuSeccompSyscall denylist[] =3D { + /* default set of syscalls to denylist */ { 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; } =20 - for (i =3D 0; i < ARRAY_SIZE(blacklist); i++) { + for (i =3D 0; i < ARRAY_SIZE(denylist); i++) { uint32_t action; - if (!(seccomp_opts & blacklist[i].set)) { + if (!(seccomp_opts & denylist[i].set)) { continue; } =20 - action =3D qemu_seccomp_get_action(blacklist[i].set); - rc =3D seccomp_rule_add_array(ctx, action, blacklist[i].num, - blacklist[i].narg, blacklist[i].arg_cm= p); + action =3D qemu_seccomp_get_action(denylist[i].set); + rc =3D 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; } } --=20 2.26.2 From nobody Tue Nov 18 18:19:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612299574; cv=none; d=zohomail.com; s=zohoarc; b=VPlLoWoSIP2s6TBdywpPKMC7kmO5x1h9OH/JFONntLnWBQ0KT49JuzP1ZgYVecaXACVUjRoL6oY3xqV0oFe64GvWDR/mfatzvFulATAqxpBgEgrcXQNk1lILEd5czCDOFCRycb4TYK7XG8479nw5TzmZOTHvgRarhPbOwlSeYdg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612299574; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=fKnLbyA8FIbavjZwoLXTNCVP5/2XH47CtTSSPjQnXKc=; b=JpOw/O343QWvlERWFdw5OpzSP1F+Vi7r4R4PzZiKDCJPZwp/CqWQtF6MX2Jlx8ubi8V3P23ao9KmlOxJGAVVXQeK+GH9attDk6mpGhe7gGdKVYINqbDm3aMTNbdLPXOTxJqhc9AJ8fwwQIK8n/UFD3Xw1CsOX1NBOeQYtoeqjM8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612299574914759.6585219109543; Tue, 2 Feb 2021 12:59:34 -0800 (PST) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-283-hiJ43h1-MH-PWh2iaBGBug-1; Tue, 02 Feb 2021 15:59:32 -0500 Received: by mail-ej1-f71.google.com with SMTP id ar27so9511130ejc.22 for ; Tue, 02 Feb 2021 12:59:32 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id du6sm2345ejc.78.2021.02.02.12.59.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:59:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612299573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fKnLbyA8FIbavjZwoLXTNCVP5/2XH47CtTSSPjQnXKc=; b=dbzp65RK7Fx7skdoQ/XipMQzc+W1gXOwUq2kArbj9y4Dbj2ctLtiRUFLb9MPAY3sHuGGZB 0O5YKuDE7C8M5Hkb6nfo0lTV0NzOsbo3KThdvdcIzdSFeunvRVKohLB8NBwG1pO1hJQr0h nnxiUAIIvo/I3r+2hjdc4dmMviIfgLQ= X-MC-Unique: hiJ43h1-MH-PWh2iaBGBug-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fKnLbyA8FIbavjZwoLXTNCVP5/2XH47CtTSSPjQnXKc=; b=GUozERx9TKLZd3ZmvqjlL1jKpk6zMVnPgMaT3/k8woJ9OmRHQO9DOCQ+QkGFbjRCw4 gMGqGOQsBwwye+AfAGMCsYUXkyY+rUEqmCBD6h0ZuJnYM0fzLfiACIEOKmUPo277mcg9 XecI4VpRpGMX7nMOHEsqYoocR0BDjdZMa2geuBVTbNzRZ6RMqA0UIwnPy9RP4yG26oVS KM5B5OEGUBdef+igzgRRYF9H987Dmw5o8ILgRjQCfp8vqyIiqGZWOFc+7YFqB5Lx5zJF BMff2AzGWMkQw976OAu1AbP5R2ZiHSwgcnZreqFDMooHD140iV+iPrPPicpvujgqg9/c RMRg== X-Gm-Message-State: AOAM533yoobIDxHMcRyCaNH09ePYztjnvLRMXO7uAVUIdnIrFv+mIB/x uiJmgrJE3RJPJt9ITyz9VrbM96wu92fyaiqJ1XZIJi6E01ZFVPtIGQ/ehSsaDtmd31XrR7GCJGa MF/H1xilFSl++Ag== X-Received: by 2002:a17:907:2d9e:: with SMTP id gt30mr3077697ejc.357.1612299571327; Tue, 02 Feb 2021 12:59:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJx5Aa9y4KjL1M4o9+I//59lOtc0x7xo8x877LQnM1OUm8TzwGhTYWYyWa9rW6YBtO4yv9EcfA== X-Received: by 2002:a17:907:2d9e:: with SMTP id gt30mr3077684ejc.357.1612299571200; Tue, 02 Feb 2021 12:59:31 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Dr. David Alan Gilbert" , Eduardo Otubo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , Aurelien Jarno , qemu-block@nongnu.org, Kevin Wolf , Michael Roth , Peter Maydell , Alex Williamson , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 09/12] qemu-options: Replace the word 'blacklist' Date: Tue, 2 Feb 2021 21:58:21 +0100 Message-Id: <20210202205824.1085853-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210202205824.1085853-1-philmd@redhat.com> References: <20210202205824.1085853-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- qemu-options.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index d0410f05125..75997ee2ea6 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4275,11 +4275,11 @@ DEF("sandbox", HAS_ARG, QEMU_OPTION_sandbox, \ " by the kernel, but typically no longer used by mo= dern\n" \ " C library implementations.\n" \ " use 'elevateprivileges' to allow or deny QEMU process= to elevate\n" \ - " its privileges by blacklisting all set*uid|gid sy= stem calls.\n" \ + " its privileges by denylisting all set*uid|gid sys= tem calls.\n" \ " The value 'children' will deny set*uid|gid system= calls for\n" \ " main QEMU process but will allow forks and execve= s to run unprivileged\n" \ " use 'spawn' to avoid QEMU to spawn new threads or pro= cesses by\n" \ - " blacklisting *fork and execve\n" \ + " denylisting *fork and execve\n" \ " use 'resourcecontrol' to disable process affinity and= schedular priority\n", QEMU_ARCH_ALL) SRST --=20 2.26.2 From nobody Tue Nov 18 18:19:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612299581; cv=none; d=zohomail.com; s=zohoarc; b=Y/qDZuVmdXDcBSon2vNZWbVm1xZGQRxyrLUUr8l81UHI6/GxyQxBf6i31g78KoQnAThdIYIogK8ujefgdZ+j+PRuF0i4uhobt7/TKPTw9yJVkXx52dxhhQB5/oa6n/Ti5E8yb/bdtB2SwlzUrIQ3lc+/5/EPyf68Ahci9hQ6eEk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612299581; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=dCfyGHzbfzBUDJy/U9zdNX3uk8PQFIhBr0LUrgPgKnQ=; b=OgqMKMY3H0t8vjmJWpdGxRlLRSXuAOUbLol2xo2oGlgB/xGC3JYWCfKQzzwJ07/jiisEEtuhc1K4mziHHk9CBTKZysNdSCyvC8+mH4L0LR9KveIG4cBYhwN9tlqAWpK3d3MFInNqp20XxAyipSsZMxrgKdUyDVSbBh8dgZisx+g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612299581117598.8192359367356; Tue, 2 Feb 2021 12:59:41 -0800 (PST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-454-3l4XpjhCPWuY4Q-_fIcJYQ-1; Tue, 02 Feb 2021 15:59:38 -0500 Received: by mail-ed1-f72.google.com with SMTP id g6so2412889edy.9 for ; Tue, 02 Feb 2021 12:59:38 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id g9sm5662ejp.55.2021.02.02.12.59.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:59:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612299580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dCfyGHzbfzBUDJy/U9zdNX3uk8PQFIhBr0LUrgPgKnQ=; b=WQ41MlHSXRiaiqJOJS90tYS8mkc5tp6nJOr3yYtN8kAsboKrGtYYdZSmUGhApEBu6UKR/O WDjp0VTMeP8C7GGmh4kYDLuDzVsITVAjhzPptWIVxxJbMCnt6J+hjjjJndA2dQXQn73qfZ BTRRRHm4r5DJJ68HA5S3OF6zcZV8Bi8= X-MC-Unique: 3l4XpjhCPWuY4Q-_fIcJYQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dCfyGHzbfzBUDJy/U9zdNX3uk8PQFIhBr0LUrgPgKnQ=; b=XbUyJp4XeUAq2mmvKiDTTN/8wDcTHXS4UYozCDnM+x/fKWkQKuSt+babvP8SXY6kml EfiHD+N5TVVIn7RfPY/x06HewcYH763a9laiDGL+aiHdnGFs0Uhn1vmgWn1JWX5TZVIG 3zGoQzNn3qPXZIkko5EuX2bltHedEHzGvF3bUhwqmSPDkvo4a5NAEpbsGprByI3XYRCk gAgyD3M8tnsMjXdHPHPX+mH8+Bw5X1isPl1erBDAI+Be/6Vi3c7TCtnkd0lPtv6ee/cr F55Sxgvwx3FXkjfxg3e1s3FSIdlyFJjefmzi+Er0//c469lhoDBfKqGjIA+cEDsqGfs1 ZxWw== X-Gm-Message-State: AOAM532HgxMzreRPAJuHiH4LM62HoV/7SGW2PIu67eLvl0eedTw1hDw5 HpqYRy/vBl+fF+A14D0qUajeoZSHg90YfmtZIg5x9a6GfkWvqSOdVu/rcGcIsNnBV4ZcQb6qsxr mRLlKO4Mj6b04VA== X-Received: by 2002:a17:907:78d5:: with SMTP id kv21mr11594774ejc.461.1612299577086; Tue, 02 Feb 2021 12:59:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJy0uC8KACyPZfRQ8o/TZNen5kFDDAgF1ARFaqFYyBX32kGh5iUulVnTzasyloiiyZbFHyj0yw== X-Received: by 2002:a17:907:78d5:: with SMTP id kv21mr11594764ejc.461.1612299576867; Tue, 02 Feb 2021 12:59:36 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Dr. David Alan Gilbert" , Eduardo Otubo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , Aurelien Jarno , qemu-block@nongnu.org, Kevin Wolf , Michael Roth , Peter Maydell , Alex Williamson , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 10/12] tests/qemu-iotests: Replace the words 'blacklist/whitelist' Date: Tue, 2 Feb 2021 21:58:22 +0100 Message-Id: <20210202205824.1085853-11-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210202205824.1085853-1-philmd@redhat.com> References: <20210202205824.1085853-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Follow the inclusive terminology from the "Conscious Language in your Open Source Projects" guidelines [*] and replace the words "blacklist" and "whitelist" appropriately. [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qemu-iotests/149 | 14 +++++++------- tests/qemu-iotests/149.out | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149 index 328fd05a4c9..b1d3f5fad67 100755 --- a/tests/qemu-iotests/149 +++ b/tests/qemu-iotests/149 @@ -500,7 +500,7 @@ configs =3D [ =20 ] =20 -blacklist =3D [ +denylist =3D [ # We don't have a cast-6 cipher impl for QEMU yet "cast6-256-xts-plain64-sha1", "cast6-128-xts-plain64-sha1", @@ -510,17 +510,17 @@ blacklist =3D [ "twofish-192-xts-plain64-sha1", ] =20 -whitelist =3D [] +allowlist =3D [] if "LUKS_CONFIG" in os.environ: - whitelist =3D os.environ["LUKS_CONFIG"].split(",") + allowlist =3D os.environ["LUKS_CONFIG"].split(",") =20 for config in configs: - if config.name in blacklist: - iotests.log("Skipping %s in blacklist" % config.name) + if config.name in denylist: + iotests.log("Skipping %s in denylist" % config.name) continue =20 - if len(whitelist) > 0 and config.name not in whitelist: - iotests.log("Skipping %s not in whitelist" % config.name) + if len(allowlist) > 0 and config.name not in allowlist: + iotests.log("Skipping %s not in allowlist" % config.name) continue =20 test_once(config, qemu_img=3DFalse) diff --git a/tests/qemu-iotests/149.out b/tests/qemu-iotests/149.out index 6877ab6c4a4..19ae092987b 100644 --- a/tests/qemu-iotests/149.out +++ b/tests/qemu-iotests/149.out @@ -478,7 +478,7 @@ sudo cryptsetup -q -v luksClose qiotest-145-cast5-128-c= bc-plain64-sha1 # Delete image unlink TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img =20 -Skipping cast6-256-xts-plain64-sha1 in blacklist +Skipping cast6-256-xts-plain64-sha1 in denylist # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dm-crypt aes-256-cbc= -plain-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image truncate TEST_DIR/luks-aes-256-cbc-plain-sha1.img --size 4194304MB @@ -1319,7 +1319,7 @@ sudo cryptsetup -q -v luksClose qiotest-145-twofish-1= 28-xts-plain64-sha1 # Delete image unlink TEST_DIR/luks-twofish-128-xts-plain64-sha1.img =20 -Skipping twofish-192-xts-plain64-sha1 in blacklist +Skipping twofish-192-xts-plain64-sha1 in denylist # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dm-crypt serpent-128= -xts-plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image truncate TEST_DIR/luks-serpent-128-xts-plain64-sha1.img --size 4194304MB @@ -1560,8 +1560,8 @@ sudo cryptsetup -q -v luksClose qiotest-145-serpent-1= 92-xts-plain64-sha1 # Delete image unlink TEST_DIR/luks-serpent-192-xts-plain64-sha1.img =20 -Skipping cast6-128-xts-plain64-sha1 in blacklist -Skipping cast6-192-xts-plain64-sha1 in blacklist +Skipping cast6-128-xts-plain64-sha1 in denylist +Skipping cast6-192-xts-plain64-sha1 in denylist # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dm-crypt aes-256-xts= -plain64-sha224 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image truncate TEST_DIR/luks-aes-256-xts-plain64-sha224.img --size 4194304MB --=20 2.26.2 From nobody Tue Nov 18 18:19:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612299587; cv=none; d=zohomail.com; s=zohoarc; b=hKUiPVBX2glSLWdqrqKEdDdv9JfpUVaPzIJl9sCQ3kLaxkes1N7mIQcSJrBsMFVi/PJ2EQrXd7f0TsihTVA0nq7i93YzcCCuI84APzjb61XRxwi9vYu+X+JUbM+Vi/b5McOODx3qMWUoBl4TsNJTry3lJPZscLTHs7MlVTrLXgo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612299587; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=GCsDS0t3ZTS4NBHckBplUJ0frNx7d00ggon3r8WYiLc=; b=kLCMBjOKiqeXZNv7/P7CQexNcMqpmZrTJq9Tm4pyMpCtqdo0Lb1OWrtMTsLkLB8xYVGANgdb333mJEMMgC2M84wd5IjCmu6jnZRkgSjT53YX9onsQhb5nvWwMKpQfRB4pP/USqimpAbsBrnHNNat74oozRv7eX4scJM0Zg6mt1s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612299587253681.4529835695967; Tue, 2 Feb 2021 12:59:47 -0800 (PST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-185-ve7s1PQ2PJ-c_I6aJ8FYwA-1; Tue, 02 Feb 2021 15:59:44 -0500 Received: by mail-ed1-f72.google.com with SMTP id i4so4208507edt.11 for ; Tue, 02 Feb 2021 12:59:44 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id r7sm11639ejo.20.2021.02.02.12.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:59:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612299586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GCsDS0t3ZTS4NBHckBplUJ0frNx7d00ggon3r8WYiLc=; b=JLQIPC3z4E/JW4aKd7bJ4jEKQNRTqMk1JDm6eXYdsvaNQD2dqv0RU3yetwowN2UpVSHjS2 HEsLLUG+OgiOqf9bdj0W7IBIaorRr6JEWu7gpwfnqQmsPK7iiQPbpVZe0GE8Jbew6RCxVs HDj2YPcMOdykJhlTtWjuLSBZyiHukoE= X-MC-Unique: ve7s1PQ2PJ-c_I6aJ8FYwA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GCsDS0t3ZTS4NBHckBplUJ0frNx7d00ggon3r8WYiLc=; b=lKoLIx4dL+cs82vpRCT59A+fk1tnvXmn/ee+86Ye4NT+pkqY3QJrfjbumuydykohSx fnOFntB63BR7IvMkn09Je+nUV8Ls9XU5BlFZ/vtOEVig0qn75dhvohepC1PnHIuU+iKR Z3leKFf7j8QUUqY+hTwIAQCWrx5RYSRP3binZszA6fyJ7fnMjB91cW2HfIGRHg77EiVG Xeil/A1Qp0Q///5XtI3vebH6OGEmSqc/HEmOO9Wosjt+DXUvuF8LXsb9fxVg6ekIDXtq xMzU+PnMAdMuDZHAm1FyWJSB97072ua4FQjbqeL+3ps2osc04BmkfnI+wTwgSCvPHxM7 B6eg== X-Gm-Message-State: AOAM5332xUJvsQ2GkDV6P/61Fmfc5U8ExAtVE0B7yOjg457MARDcws5c dYX5oXlKzdnXhDn0Bqk4YXZ1gsciAeR2gJF0bzA3dfPzCfhrI9kfjKvVawOxIXNvWAHblqTxS7t zm+ch2foyaJz7Cw== X-Received: by 2002:a17:906:5e5a:: with SMTP id b26mr12697564eju.327.1612299583615; Tue, 02 Feb 2021 12:59:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJxOQeuoj112ym+ONA8FZIjcqwUF9f63qKeGMpddE4Wk1sSoT+WivNEbYh/Xf6y/79FDpYFrXA== X-Received: by 2002:a17:906:5e5a:: with SMTP id b26mr12697549eju.327.1612299583451; Tue, 02 Feb 2021 12:59:43 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Dr. David Alan Gilbert" , Eduardo Otubo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , Aurelien Jarno , qemu-block@nongnu.org, Kevin Wolf , Michael Roth , Peter Maydell , Alex Williamson , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 11/12] tests/fp/fp-test: Replace the word 'blacklist' Date: Tue, 2 Feb 2021 21:58:23 +0100 Message-Id: <20210202205824.1085853-12-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210202205824.1085853-1-philmd@redhat.com> References: <20210202205824.1085853-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Alex Benn=C3=A9e Reviewed-by: Daniel P. Berrang=C3=A9 --- 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"); } =20 -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 =3D=3D 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; } =20 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); =20 - if (blacklisted(op, rmode)) { + if (!is_allowed(op, rmode)) { not_implemented(); return; } --=20 2.26.2 From nobody Tue Nov 18 18:19:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612299594; cv=none; d=zohomail.com; s=zohoarc; b=keyg4oZc+oHl5Ra8jX45zaqF7CCo0RgY2wG8IqJwCbbQpGGod+eIdUazKNW4pn8e9poG3icKb3Vz1peE7us5ImHyHLsyZaSvz+Is2x/o11Gu9lp0A61fbbKmhKXTbQDL6X8jxMYExMzO3jO9O2+0MCwAAJ4f+CC244oflvW6qog= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612299594; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=RCwL7X+YG8I7zuVW+8dXIaUVElWXRJ89Y3C+f17wiig=; b=VZEURaF4oGws9dPcbIi4bRQHlklrk9x5wlTT9a6lur1niYNgv048DQiOu/QqDqTwoutG7zRg0sELGddfdWA3kLoViDcL8To1a/s0Cc4jXsgPOLxOU3Upe5QOyTG4GXuqgQqjub5fFx61tJMiihtTOE170bCYbYP32ps2JMeY800= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612299594330279.8173707669333; Tue, 2 Feb 2021 12:59:54 -0800 (PST) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-245-4xtcLSvCN3-hw7LZFIey7A-1; Tue, 02 Feb 2021 15:59:51 -0500 Received: by mail-ej1-f70.google.com with SMTP id m4so10580115ejc.14 for ; Tue, 02 Feb 2021 12:59:51 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id e7sm11918ejb.19.2021.02.02.12.59.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:59:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612299593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RCwL7X+YG8I7zuVW+8dXIaUVElWXRJ89Y3C+f17wiig=; b=TV4OUp+x0phCHczao5smJjNCcc3mxI9KH7F1h3a1bf4HQEJITvIpvvNI8/1l2jhZHF+N/6 v9/uOiiVsg3xVklci5V3wn5Qzz2ivHXM6kF04dMEZTBtdM/e4qo/V/y/TAC6BMKwGPyDfM 1sShxsQtIGkraIYATYmFr0UityJgnGY= X-MC-Unique: 4xtcLSvCN3-hw7LZFIey7A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RCwL7X+YG8I7zuVW+8dXIaUVElWXRJ89Y3C+f17wiig=; b=uUotYc8nM1ES/s1jsxsTilEaHt4b2ddBEdqPG2zBF5vkkQvOhDM8dytgBaCevCBFkB Tl9NI0I7OZPq5jKfArtR/0jSB3N1IWJ98nu2agCosTFixGMGnmDwghIMM0ehLA5wjDhA +4LXZSKrkrWs0Ln3IMKYPXfI1y/eke6lQ9oJLvP9h1t07jm0z+VLREzPdnbgCkv4urTY HtEWNc6oztxHND98ecuRBA2TmjYQ0s8pDA0aTh+ARl0TE+oJKnWAOFrD3JLx63hbNyyU 85pXEG5ZBSanjc6HEg0K6LDmcItMXKM0gL4DVE1b+T8WrrO8CxdwA0B+1pR8UeClg3Wc /nlQ== X-Gm-Message-State: AOAM532G7u9PS+1wtbXuWehIhKaNk8SNt0JfX6wmhymMn/j51gvt7yTu zAqemk6Cd1Y/ERG5XNzB1L3a07aaSJEILF3adLT2S+f/uY1F3HH2ySx95dH15F8b5F8wCv0+VMi psPxYNoqxjNAJSw== X-Received: by 2002:a17:906:25db:: with SMTP id n27mr24055302ejb.552.1612299589402; Tue, 02 Feb 2021 12:59:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJwwtBhkk7ZwSbIIG00pnkr4d8G9mx4OqL+199FXTzPG8YMKWoUzXyXTvbwMUAaceZWjiciitA== X-Received: by 2002:a17:906:25db:: with SMTP id n27mr24055283ejb.552.1612299589261; Tue, 02 Feb 2021 12:59:49 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Dr. David Alan Gilbert" , Eduardo Otubo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , Aurelien Jarno , qemu-block@nongnu.org, Kevin Wolf , Michael Roth , Peter Maydell , Alex Williamson , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 12/12] hw/vfio/pci-quirks: Replace the word 'blacklist' Date: Tue, 2 Feb 2021 21:58:24 +0100 Message-Id: <20210202205824.1085853-13-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210202205824.1085853-1-philmd@redhat.com> References: <20210202205824.1085853-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Alex Williamson Reviewed-by: Alex Williamson Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/vfio/pci.h | 2 +- hw/vfio/pci-quirks.c | 14 +++++++------- hw/vfio/pci.c | 4 ++-- hw/vfio/trace-events | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h index 1574ef983f8..64777516d16 100644 --- a/hw/vfio/pci.h +++ b/hw/vfio/pci.h @@ -197,7 +197,7 @@ void vfio_pci_write_config(PCIDevice *pdev, uint64_t vfio_vga_read(void *opaque, hwaddr addr, unsigned size); void vfio_vga_write(void *opaque, hwaddr addr, uint64_t data, unsigned siz= e); =20 -bool vfio_blacklist_opt_rom(VFIOPCIDevice *vdev); +bool vfio_opt_rom_in_denylist(VFIOPCIDevice *vdev); void vfio_vga_quirk_setup(VFIOPCIDevice *vdev); void vfio_vga_quirk_exit(VFIOPCIDevice *vdev); void vfio_vga_quirk_finalize(VFIOPCIDevice *vdev); diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index fc8d63c8504..81c3e30df77 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -43,19 +43,19 @@ static const struct { uint32_t vendor; uint32_t device; -} romblacklist[] =3D { +} rom_denylist[] =3D { { 0x14e4, 0x168e }, /* Broadcom BCM 57810 */ }; =20 -bool vfio_blacklist_opt_rom(VFIOPCIDevice *vdev) +bool vfio_opt_rom_in_denylist(VFIOPCIDevice *vdev) { int i; =20 - for (i =3D 0 ; i < ARRAY_SIZE(romblacklist); i++) { - if (vfio_pci_is(vdev, romblacklist[i].vendor, romblacklist[i].devi= ce)) { - trace_vfio_quirk_rom_blacklisted(vdev->vbasedev.name, - romblacklist[i].vendor, - romblacklist[i].device); + for (i =3D 0 ; i < ARRAY_SIZE(rom_denylist); i++) { + if (vfio_pci_is(vdev, rom_denylist[i].vendor, rom_denylist[i].devi= ce)) { + trace_vfio_quirk_rom_in_denylist(vdev->vbasedev.name, + rom_denylist[i].vendor, + rom_denylist[i].device); return true; } } diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index f74be782091..759a3b1abf4 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -900,7 +900,7 @@ static void vfio_pci_size_rom(VFIOPCIDevice *vdev) =20 if (vdev->pdev.romfile || !vdev->pdev.rom_bar) { /* Since pci handles romfile, just print a message and return */ - if (vfio_blacklist_opt_rom(vdev) && vdev->pdev.romfile) { + if (vfio_opt_rom_in_denylist(vdev) && vdev->pdev.romfile) { warn_report("Device at %s is known to cause system instability" " issues during option rom execution", vdev->vbasedev.name); @@ -927,7 +927,7 @@ static void vfio_pci_size_rom(VFIOPCIDevice *vdev) return; } =20 - if (vfio_blacklist_opt_rom(vdev)) { + if (vfio_opt_rom_in_denylist(vdev)) { if (dev->opts && qemu_opt_get(dev->opts, "rombar")) { warn_report("Device at %s is known to cause system instability" " issues during option rom execution", diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events index c0e75f24b76..079f53acf28 100644 --- a/hw/vfio/trace-events +++ b/hw/vfio/trace-events @@ -49,7 +49,7 @@ vfio_pci_emulated_sub_vendor_id(const char *name, uint16_= t val) "%s 0x%04x" vfio_pci_emulated_sub_device_id(const char *name, uint16_t val) "%s 0x%04x" =20 # pci-quirks.c -vfio_quirk_rom_blacklisted(const char *name, uint16_t vid, uint16_t did) "= %s %04x:%04x" +vfio_quirk_rom_in_denylist(const char *name, uint16_t vid, uint16_t did) "= %s %04x:%04x" vfio_quirk_generic_window_address_write(const char *name, const char * reg= ion_name, uint64_t data) "%s %s 0x%"PRIx64 vfio_quirk_generic_window_data_read(const char *name, const char * region_= name, uint64_t data) "%s %s 0x%"PRIx64 vfio_quirk_generic_window_data_write(const char *name, const char * region= _name, uint64_t data) "%s %s 0x%"PRIx64 --=20 2.26.2