From nobody Tue Nov 18 19:43:45 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=1612545512; cv=none; d=zohomail.com; s=zohoarc; b=C0Kr3E3ldY/12UdE4mlB+PBDtaj/cPOZBq2Q8kGGMDSwZTQ+HGtDroCwJJ4YuaSt8qs9tQ02Ykqy9NZpKL+GB+MZoh0ft5R5uaK8e37l+2IeIpuxUTTIE7s96GHYx1eryWbFpFZaNAImFkxOGXQEudNlAuEh/5a/iCekth9wWMI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612545512; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Nx2nPxxxuc5UiIMJauJWi9ngWETzpUQ2HSqsQ8pKpvE=; b=njg5mAtWX18WvvWcyaZX6bKNsZEu9RGgQgM4zOnWdmD4RJMXnIdmRN0UXYa5xGjCXxqqswiAbqTg4/XQXy8t25bBMVrwiavvPyzxyAcWk+i+rLe1DegwMuMI2zaPoFD5o/z93eFL0KCvFeDIEgCuR0au1dKrLXmKAet2vgqvelw= 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 1612545512474329.1221819041241; Fri, 5 Feb 2021 09:18:32 -0800 (PST) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-68-0tdeYWp2N-Cv69spTxp7Rw-1; Fri, 05 Feb 2021 12:18:27 -0500 Received: by mail-ej1-f69.google.com with SMTP id bx12so7126776ejc.15 for ; Fri, 05 Feb 2021 09:18:27 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id o10sm4202431eju.89.2021.02.05.09.18.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 09:18:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612545511; 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=Nx2nPxxxuc5UiIMJauJWi9ngWETzpUQ2HSqsQ8pKpvE=; b=Z7YfT478fWYxNX80JIHC7Fkttmj5wlJN5Y6bBOgUasM8czqZdZnTvrPBUh+k9BgPKF/R0C 9YWjyU0lpqFH/feT1v064MiZDOD3wPnvBeD31sQWRZvs2IBo6afe5fqcsc+hLIzRSFw4Dd C15AyQmKoG0Melgelyp9OSbx4vtDDLk= X-MC-Unique: 0tdeYWp2N-Cv69spTxp7Rw-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=Nx2nPxxxuc5UiIMJauJWi9ngWETzpUQ2HSqsQ8pKpvE=; b=GleqRoSONCsHvuudVU1//IL/d+5vtDDARp/JIUY7iIDkJWOHE+90fAsWm4D0nU+dN5 OvPD7C0F1PBpyp+vmuOiP0a2yNk1vrrHOvcLdCHQRDx1NE8n0mJuPMwA5xWkdi7CEQd7 Z537+mOVFSebiauFGeZJP2ksXgFpRts5clSoGAu1dNTLjTiUCI1R56Eg6xv9mTfhmjdW af+EhUoH1tuQU+Sic+hbuwjot0kOGO3m+OMmxmNkdyUY/4q/vt+fYfH2heZzf+w96l7s qRf8IvkM0WGgwhnO8tjfEGlRqShjGd8mnUhWrMSY1L2gSP05kKNSwP8Bo4YhJ1YjufBn uZsQ== X-Gm-Message-State: AOAM532apfVLKnf1gUxFvjsLMlZE5Eu9mn0wKJDLCQ+UHOMgUsNJTFos 77axZRbGLyL058705rkrwKXJizsBIuf2arI0ptUnXqC2J9FOQi6u6CKwHppEqObuF+W+yUsv8zv jD+T6T5GTqV/8/g== X-Received: by 2002:aa7:d817:: with SMTP id v23mr4384803edq.192.1612545506484; Fri, 05 Feb 2021 09:18:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJxjdTz5eqTHEvfZlrunlq58k7UhC7YnmB7AkgytyFRKvCFHrxg39Cnyds41amdwXJqZx3BLpg== X-Received: by 2002:aa7:d817:: with SMTP id v23mr4384780edq.192.1612545506377; Fri, 05 Feb 2021 09:18:26 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Max Reitz , Peter Maydell , Stefan Hajnoczi , Eduardo Otubo , qemu-block@nongnu.org, Gerd Hoffmann , Aurelien Jarno , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Alex Williamson , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/8] ui: Replace the word 'whitelist' Date: Fri, 5 Feb 2021 18:18:10 +0100 Message-Id: <20210205171817.2108907-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205171817.2108907-1-philmd@redhat.com> References: <20210205171817.2108907-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 Reviewed-by: Gerd Hoffmann Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth --- v2: Do not use acronyms (danpb) --- ui/console.c | 2 +- ui/vnc-auth-sasl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/console.c b/ui/console.c index c5d11bc7017..5a8311ced20 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1708,7 +1708,7 @@ bool dpy_gfx_check_format(QemuConsole *con, return false; } } else { - /* default is to whitelist native 32 bpp only */ + /* default is to allow native 32 bpp only */ if (format !=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..df7dc08e9fc 100644 --- a/ui/vnc-auth-sasl.c +++ b/ui/vnc-auth-sasl.c @@ -288,7 +288,7 @@ static int protocol_client_auth_sasl_step(VncState *vs,= uint8_t *data, size_t le goto authreject; } =20 - /* Check username whitelist ACL */ + /* Check the username access control list */ if (vnc_auth_sasl_check_access(vs) < 0) { goto authreject; } @@ -409,7 +409,7 @@ static int protocol_client_auth_sasl_start(VncState *vs= , uint8_t *data, size_t l goto authreject; } =20 - /* Check username whitelist ACL */ + /* Check the username access control list */ if (vnc_auth_sasl_check_access(vs) < 0) { goto authreject; } --=20 2.26.2 From nobody Tue Nov 18 19:43:45 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=1612545517; cv=none; d=zohomail.com; s=zohoarc; b=Msj16OCSEItdQlYZBSQXBioDEH/XQT+qX6BFqawo30pqNwuDy1lP3CEKm9K+c2DpR8fWqeCO6n1kd7PHFetrH9QsIODVtSzlqzdhhLHR/zrZ2gITVc2AOPZyQHFtB/w53TJextstK6nIguJBJnBUnm3VsK3KuaWrBfCatO9tA4Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612545517; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=tvkGAS1d8gMkXdxEKA7vhiRkEZi0iEfIHD2yWVNztu0=; b=DopZXwVUjiW8QSYMQ+/tNrKjgd5hxcvY19r2DR0/GAz3ldUzjt3XcG5pHkoiocBgZbNUT7+IeWqNwiIov7rGpJSKB1Nk3eg2rsxP2FzKTvNG/trSIxAxdKQHRRS9DSMW++QG9vX2+VbKkwcWanuU3LOoT3r5EoNnqz3uZGXqAgM= 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 1612545517254891.718393425412; Fri, 5 Feb 2021 09:18:37 -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-600-kJxt2p1mMhyAhgG9VN4o3w-1; Fri, 05 Feb 2021 12:18:33 -0500 Received: by mail-ej1-f72.google.com with SMTP id jl9so2741722ejc.18 for ; Fri, 05 Feb 2021 09:18:33 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id jg33sm4024895ejc.103.2021.02.05.09.18.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 09:18:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612545516; 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=tvkGAS1d8gMkXdxEKA7vhiRkEZi0iEfIHD2yWVNztu0=; b=b4yrZlc71no83TgamvsB/fuXtXcaZphAx88izTsul3kn1EyaybTf1KEigZc/wLIu2Ydsjc nlB/pa3aHIfd+bW7Fau2EzobaxhpJEwTuNw1da5BGfGi/uW3EKC/U/KIKE9M1s+nKXvxq8 VnP/M69e0Z5vXjo9NYMH5lpyMlpzI5I= X-MC-Unique: kJxt2p1mMhyAhgG9VN4o3w-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=tvkGAS1d8gMkXdxEKA7vhiRkEZi0iEfIHD2yWVNztu0=; b=ZexTYCIE71gy7p3wUQQFo3sgI30MhxhxgNyVyWyCuj3SLc4GQ3WOq9TDTPjQJEvQI9 TMVojjSXmRwXp+GLtSk8momXxz+TY2kIExngtEJ1e+oS3v/AkZzhytfzUz7a237le/4W unkNxhvJsKwQuNQS5EXTLQipiAsuWdDSO1ntJ4Ng0JnJdTL9uX/fCxLJrE0hFzlJhYix QFhKU0uJguLn1/DmR4T7TFgTnCn/z3HQ75vvJugamJ8B3gwCkypuWqA72ek49vwHoNuB Lw2RgVturUF7iFBWleVHjsH7Kw5gjurWp+1qR3PFCR7ffpinZxOTZTac1jEe/XzpqTl8 32qA== X-Gm-Message-State: AOAM533I6mn9r8fIZ/CCh6HHC8pSvQ0+BtQugVnmN/j3T5VgdbPzYM6C g6G7wituydqFGJWoeTKSJkW94Phf22qRiqz8sisadYnSVZcnLdk5xu8V+UuodRDRqHdW0Mxnz3d AAWLYqBS0CItbWg== X-Received: by 2002:a17:907:7815:: with SMTP id la21mr4782908ejc.12.1612545512614; Fri, 05 Feb 2021 09:18:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJwwWRnt27K2PaM65RzYXPAJK+6DktdX6kWlNRCxmyUkeYg/7mBB3xs1gZyRore0Q1tyfkN+rA== X-Received: by 2002:a17:907:7815:: with SMTP id la21mr4782893ejc.12.1612545512441; Fri, 05 Feb 2021 09:18:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Max Reitz , Peter Maydell , Stefan Hajnoczi , Eduardo Otubo , qemu-block@nongnu.org, Gerd Hoffmann , Aurelien Jarno , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Alex Williamson , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH v2 2/8] tools/virtiofsd: Replace the word 'whitelist' Date: Fri, 5 Feb 2021 18:18:11 +0100 Message-Id: <20210205171817.2108907-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205171817.2108907-1-philmd@redhat.com> References: <20210205171817.2108907-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 Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 147b59338a1..5f3afe85579 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -3204,7 +3204,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) @@ -3214,8 +3214,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 ea852e2e33b..62441cfcdb9 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 */ @@ -117,12 +117,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 @@ -153,10 +153,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 19:43:45 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=1612545522; cv=none; d=zohomail.com; s=zohoarc; b=akKSTJhr867tqfoW1V+gzZmzWF/XC1j0327bgnKnayrw5E9XQSKMgq4Q57wGNePq+4kau8ANfvFI08GPydGFWHhpt8ZyckjJ+75ypzE1TcqWILiqTFfMtFe7MgWASKctxyWHmxSBG1unCWFSwuk4aLPKobfP8Wla5S2XiSk+WgE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612545522; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=XE1qpDXSxBNLgyX0fJYBkKe6H7ZMcFTck+t+2JkZ/Xc=; b=DsU8WZddIAKzcKspKn8kXiOR9/yApWNepY12Z+eHS1q3V8UISdMvxgTYi39vQL+4jSIeZIMd0ZUpOmAloUmOPujcbfRvP2kTbs06V3eUoezfU9OEp74Xq5pV0KD9WPNnq74bD0YmM/Rx6M7DM2S1DCzwUx/XgWbFZTjiRFlNPDg= 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 1612545522609349.6191510939209; Fri, 5 Feb 2021 09:18:42 -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-468-tjVd7gqDP0u2OuQ1Z3qRwA-1; Fri, 05 Feb 2021 12:18:40 -0500 Received: by mail-ej1-f71.google.com with SMTP id ia14so6963876ejc.8 for ; Fri, 05 Feb 2021 09:18:39 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id v26sm4343637edw.23.2021.02.05.09.18.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 09:18:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612545521; 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=XE1qpDXSxBNLgyX0fJYBkKe6H7ZMcFTck+t+2JkZ/Xc=; b=WYJkk6+BwwYpK632tj+KZCNUENlXy2sWCbsPfJKgDC8PEXMUNqInz1aOD55Pe9LbeBkFlz qz6GjD5ueLa3AEISIRueO+Ez5ti5QpxeJIkndO9ceu+a5jRMxHTWozfwQK03VrVTZMUFxz Qbn9P47yKCVY4PRxFLTyKMi/UnnNWaI= X-MC-Unique: tjVd7gqDP0u2OuQ1Z3qRwA-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=XE1qpDXSxBNLgyX0fJYBkKe6H7ZMcFTck+t+2JkZ/Xc=; b=CBjj64rXDGeMvMpF3CvQmraRx4OgDliUU9jW9PiTJRRc+zaiXPqxL17Gz7xswn3JmW UcA8fq0v19s1/6bxK32uAso/g65WhgQan7NqWWaf6d8W/DhgwaSJCxjm48aljSZCIh0X birV5L1aHo584QLQzLm2qAZhImRo4GVc9FK15tGK7Qjr8t7XyrNrsA3bveFgqxTtgJGw 9iNF0kSXyeqHYuKYFibIe/1HP+6EbSDg9syqYNjUkmLlULrF5S7L38Vsj8Jh1B/7DXuk JSFf2zldbrNwykoyuqRrm0HL1ODyk9lKTMyZ3JWS/66TBck2rzUX7j/9fGGSzqiDQgoI 9i7A== X-Gm-Message-State: AOAM533pWL9VGoRX245c9cKIsHznIrgc9q1QjL3ysuqoS3v/s+d+ijfg K8b7ETh57uzHz21j8P5CM4qZEMweQUHcVa/PgU6kbSWoW8wXpt+jlgI7pdIuP0DTOlt9vsFgM5o Wy7kpiCjBDWtgyw== X-Received: by 2002:a05:6402:6d6:: with SMTP id n22mr4523047edy.128.1612545518813; Fri, 05 Feb 2021 09:18:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJwpa0pWNNWgt4BwZL/HcAG/ibRnam4nElxaBBeXObp0Ee31lhj6RXHNTc9SXdwlJdZ9PBC9hg== X-Received: by 2002:a05:6402:6d6:: with SMTP id n22mr4523022edy.128.1612545518668; Fri, 05 Feb 2021 09:18:38 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Max Reitz , Peter Maydell , Stefan Hajnoczi , Eduardo Otubo , qemu-block@nongnu.org, Gerd Hoffmann , Aurelien Jarno , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Alex Williamson , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH v2 3/8] scripts/tracetool: Replace the word 'whitelist' Date: Fri, 5 Feb 2021 18:18:12 +0100 Message-Id: <20210205171817.2108907-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205171817.2108907-1-philmd@redhat.com> References: <20210205171817.2108907-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 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth --- 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 19:43:45 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=1612545529; cv=none; d=zohomail.com; s=zohoarc; b=PfqgyhKW9bvsiFsHfDmv9mPn1dgDkjSQWpV+xMfW1zV70AKhPoS0oivUqYMlSRg7clpoEJEq86ldiulW9TJTZjzHGXJCZMwFx3Im7dcCQeyQJFFvtNNReuJxTjQRy+W761xHgwD34iPnifcN/8TRnaDo4eQgOva5KOqVzptqdP0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612545529; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=FQi3w0O1coZt6pmTX+ouvpYjqMMGeb2x43DFaeB1Fcs=; b=Gug0lIcdkAiT4HUxQNCCWYVYKeg1P/UsTaRVBGO7q8Wy8XoFL6JSKVf4ze8G+or3ezLwxSqXj3qyP+lYaOklvELULCiyQr8VU3QO55JRt0myMVUr5ZZYSpE9pmnqshGIJ52bi7+ybG3cu9Gz/7/9ewoCNGjCOERdNhPS49FwCT8= 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 1612545529273796.0617447457868; Fri, 5 Feb 2021 09:18:49 -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-284-sNC7thQIMGWXcLxYOBVkkg-1; Fri, 05 Feb 2021 12:18:46 -0500 Received: by mail-ed1-f72.google.com with SMTP id g2so7310944edq.14 for ; Fri, 05 Feb 2021 09:18:46 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id c6sm4378478edx.62.2021.02.05.09.18.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 09:18:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612545528; 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=FQi3w0O1coZt6pmTX+ouvpYjqMMGeb2x43DFaeB1Fcs=; b=D6Zuu4ztV55R+JTTJM+2riaTWi7kVp3b+3l88vU4+CUp8YUwpQxec29iwZWHhldsoyP1oM QsItB7pZRtf+/FLEklC5+0QLMcfoyVSf2ONSoOFBhIZHhHgHvhBzIS2FolJXZKUbjXxp6X AYZ0xlDAlHg5cUhh1WIHh6ndVPX0wEo= X-MC-Unique: sNC7thQIMGWXcLxYOBVkkg-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=FQi3w0O1coZt6pmTX+ouvpYjqMMGeb2x43DFaeB1Fcs=; b=D8QGIlgSh2Iie+D8QUSLyb0pcEWiU2imQLntdH25ENLnVuqaUBzRoJe7MhqjxDY6SZ Ps2bDhFve79B/FCXd9n8OaPvKl1CMWmDgvwAkAFnTE8fCWdBJIFp6BLFrgIO2jiZMLGB jQ0dGaFOL9IV77dZ8ep/PU5ewc3JCO0kMp/uLJtRZC5FPJ1+JN4A932QRj2tn314Fq8A A31vvIE5T+IFn3emAdovEmkybD1JgEgpiM9PhxrNgXf8TSzQT25n7L44px+zCOKiZZ0f uOjHi8Bq4eTMx2Orov0BmwyjJlm4jB+sVLcVdL77BNyB3AEOE1YfDPgco5U2V5YVULvT UNoA== X-Gm-Message-State: AOAM531iyjz7CsyWgHeOPqJFBZXDXsUh3olM45J1NxV0jkZISsBNmiWd eWEDZlN3j8KoNELFuhZHFj4d6Mur5agd5WpT0c+JjB0rVXpCNvbcuWA+u0BzFH57KmylqVNROrI RY/UPJK24Z2dtog== X-Received: by 2002:a05:6402:b26:: with SMTP id bo6mr4400623edb.46.1612545525398; Fri, 05 Feb 2021 09:18:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJxQERWebt5v9yJf36b+BVR5uxKSIdmBZCqA7xPibaYGs712/N4uNoBimXgddA2LnCfPiljYTA== X-Received: by 2002:a05:6402:b26:: with SMTP id bo6mr4400606edb.46.1612545525213; Fri, 05 Feb 2021 09:18:45 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Max Reitz , Peter Maydell , Stefan Hajnoczi , Eduardo Otubo , qemu-block@nongnu.org, Gerd Hoffmann , Aurelien Jarno , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Alex Williamson , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH v2 4/8] scripts/device-crash-test: Replace the word 'whitelist' Date: Fri, 5 Feb 2021 18:18:13 +0100 Message-Id: <20210205171817.2108907-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205171817.2108907-1-philmd@redhat.com> References: <20210205171817.2108907-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 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=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 19:43:45 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=1612545537; cv=none; d=zohomail.com; s=zohoarc; b=Z5jem5Jgi4V7yhcd8jDSzI29PIyVq8+q3NNNWcavK8JLcmHU2gHqJ3Swx9F7eN2Q+uZD0q4JqWO0PzXbFnMZogrUUiGFITMM2+XIFbvuv08MytiidgQCGdmoxSSphnRdBi4V1Hp2MNYzsmbRAyjG7atpr8blzWwK1o6LUVBEqvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612545537; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=pSoQiepgpeuvlonviTFU0Pq0agocqriq1sbtJ5D1E5c=; b=I0gubXQk6H/ELoNkj9SjEDkoMqKKi+nfs290voTCoWGZvV0sIPWGu9uZGJCL3HlKEGuiTqQqmTUSbvpg+HkzRopStVcmw8WLRPPluK208LNNwi08wgpLBodkY5BfJkt6ZC6xXH84Wz3X701lFp8z/g8uyK5ZSnkN++D/MGbldXg= 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 16125455371951021.9653102406755; Fri, 5 Feb 2021 09:18:57 -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-251-Dy86i6xCMt-5REZw03uZSg-1; Fri, 05 Feb 2021 12:18:52 -0500 Received: by mail-ed1-f71.google.com with SMTP id w23so7223239edr.15 for ; Fri, 05 Feb 2021 09:18:52 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id e6sm4505496edv.46.2021.02.05.09.18.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 09:18:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612545536; 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=pSoQiepgpeuvlonviTFU0Pq0agocqriq1sbtJ5D1E5c=; b=grjtkKzNRR0WbKk4mHjwPemzv2O5d7Emfs6FlcsSOInC8eR1bL3BdxMiUUVK88j9mK/wbk jrlDAzzpVJV1wWdswnihBTbqbnPg6zQOPODaRDBmKJ9entAfQO2ud4iJTgFHRXLnClZYnu /ilBpUwTfU9T5w2KI3+oLdgGxM3QhjA= X-MC-Unique: Dy86i6xCMt-5REZw03uZSg-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=pSoQiepgpeuvlonviTFU0Pq0agocqriq1sbtJ5D1E5c=; b=CGr/o0FMnjZneXp1+GdtszfxSFu50oQcM5nsDyotTZT1Yjc2JCN3pDJW+sK3Hwy5as 8fpQAnrflpBtXhI1BdgxCO53toPDIZMH/rn3E2DEJhhb7kCBdGvwuPmlWLFWg8eN4XiV E8qYJ4NfGUUxdGjJmqfJuufpOgAwOedocb69bkHMQRLB1/ie98DgzqFET2JqO2mSkxSl 5YxfJo6n7ixM6HbRZ3rd7D+g6dbxgmzii+RIhGvLWUP/RzSUBKMfGGymOELzoZIM3AfN FuimUg3nG3lL4FYvlNipwHZWUY1Cm0NX7petJ/svFJkBGYaeqIsV7qD4VPdT4NtFHtkH 6Enw== X-Gm-Message-State: AOAM530bX1bQFrxWT9Z85gCAAQPdjzwhbw+3+T0FY8cA++RKWE7eJAu/ X4tFq0uNsztmNuacaoUrfEIBbk4QMZ7qheFiLem4tIMMicm5h6ShoXbatH9++MOxaSFjGtS/j2k NLayvSQpQS11PpQ== X-Received: by 2002:aa7:de14:: with SMTP id h20mr4486713edv.95.1612545531217; Fri, 05 Feb 2021 09:18:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJwh+QfvHe5QteoXDA9vEoFKQsmWHqylEHxA4GYuiQmZNcT8dRgwtTGR0VtZWbf4UNi08KvRXQ== X-Received: by 2002:aa7:de14:: with SMTP id h20mr4486686edv.95.1612545531036; Fri, 05 Feb 2021 09:18:51 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Max Reitz , Peter Maydell , Stefan Hajnoczi , Eduardo Otubo , qemu-block@nongnu.org, Gerd Hoffmann , Aurelien Jarno , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Alex Williamson , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH v2 5/8] seccomp: Replace the word 'blacklist' Date: Fri, 5 Feb 2021 18:18:14 +0100 Message-Id: <20210205171817.2108907-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205171817.2108907-1-philmd@redhat.com> References: <20210205171817.2108907-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 Reviewed-by: Daniel P. Berrang=C3=A9 Acked-by: Eduardo Otubo Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e --- 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 19:43:45 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=1612545541; cv=none; d=zohomail.com; s=zohoarc; b=n/cKyNTwd488dSbXk4JZwFWpYBbFmjCFHCdDD3pi/KxQ3q2M2sE9PK/xF4eG42OvbUCMfH7LcjUOAwJhKBFTRoJj7xC2p9RJGh+B4DfDwEljGqLG/9QtDIW0AEKG0actSYPcMEQFHK6/hoGrGKQY2iF94ShtBXJT/tchVJ6zGSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612545541; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=9i8oDXDPeH/7jq3Qnbvz0BqQFc/V0wdV23pNv7JLEdc=; b=M52FE4EsHHThkQKbHxwBiArcfT0b/g8ofw8kIiiCs4BqtnAjVyHTPcPU+lpKiGnOA3TAb3BCoYl8MQ3xJmqt5W2vz005XHK3NKOeEhUBUsw2/dae+WHYi/Q1FTUix1QJNejwzXQISbhQh0stP1hkBJS2D10pRCpe/FCgZdBriWc= 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 1612545541097898.6720667142004; Fri, 5 Feb 2021 09:19:01 -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-250-WZSsOSaoPseLXd3Hoc9fJA-1; Fri, 05 Feb 2021 12:18:58 -0500 Received: by mail-ed1-f70.google.com with SMTP id w23so7223515edr.15 for ; Fri, 05 Feb 2021 09:18:58 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id cb21sm4297128edb.57.2021.02.05.09.18.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 09:18:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612545539; 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=9i8oDXDPeH/7jq3Qnbvz0BqQFc/V0wdV23pNv7JLEdc=; b=L8aS74Zp5GqHs6CAtpTdP7zD3Awt9O1qVX8FsfDjpU11WXAGoASpZ/qxh54p//+4Z53H9y uJb/Ecd3toLM90T/7YTd7dioYXNxh4dj2Kv/vNAa+sfoa1HI8dXowx00yng5gZwF7E3Iyc +8szL2nTdigimtw5BGzjJvqzqiwEBIY= X-MC-Unique: WZSsOSaoPseLXd3Hoc9fJA-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=9i8oDXDPeH/7jq3Qnbvz0BqQFc/V0wdV23pNv7JLEdc=; b=OCL58GaUxAK1WtKMCNrtjJfO4tdF6U3NWaoZNTO2I2KAOoTBleRCg4ULg+joKYN8wV QQPag0f6Ic9dx76mPJ1ZnXaTtmLBLDKs/8P75ZRBqjSCBMtXXrE7GFX5ZAjiISt9axH6 xmorrxEk0+QULZCJSfiexeRzEmQSJGeszs/uwpFAsnzap6J2wbHEV45KVWxpfhBnLXGg t3Q+OOB/HXpygAleZf7pDd3j3h6FoDkAcR4vjhgUwZ+IM0r2Gq414I9b1pV+y7s9LUYY CJVZK1rxH8PEE4UADgVOGXXz0MKtInb4MXmF7cBd/kSV/8JefLQLn6LfHJImiFPY6hia nUQw== X-Gm-Message-State: AOAM533xYNm+ZhEQSmOeuFzH+8ZN6EWE3Rk8oqaos36JHNwrYTJrtg9Q v80ENVyrjAipG+fVF5aumiNQQIFV98qLV/LBC2XBdQ5lUa9wrZxyru4h0XvyhFDgaIzB9sqssb7 O9Cl766HxtigYmQ== X-Received: by 2002:a17:906:914a:: with SMTP id y10mr4898761ejw.33.1612545537205; Fri, 05 Feb 2021 09:18:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxK/BymxXxj4/wtv/Oc/UeouB7c/+8o5EWtixz6ejzBOZKBVrb0PXXibQV9NReIEmN6AUyN1w== X-Received: by 2002:a17:906:914a:: with SMTP id y10mr4898743ejw.33.1612545537068; Fri, 05 Feb 2021 09:18:57 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Max Reitz , Peter Maydell , Stefan Hajnoczi , Eduardo Otubo , qemu-block@nongnu.org, Gerd Hoffmann , Aurelien Jarno , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Alex Williamson , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 6/8] qemu-options: Replace the word 'blacklist' Date: Fri, 5 Feb 2021 18:18:15 +0100 Message-Id: <20210205171817.2108907-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205171817.2108907-1-philmd@redhat.com> References: <20210205171817.2108907-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 --- v2: Reword (danpb) --- qemu-options.hx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index c09c4646e28..5f86cd2fbbf 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4274,12 +4274,12 @@ DEF("sandbox", HAS_ARG, QEMU_OPTION_sandbox, \ " use 'obsolete' to allow obsolete system calls that ar= e provided\n" \ " 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" \ + " use 'elevateprivileges' to allow or deny the QEMU pro= cess ability\n" \ + " to elevate privileges using set*uid|gid system ca= lls.\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" \ + " blocking *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 19:43:45 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=1612545548; cv=none; d=zohomail.com; s=zohoarc; b=eeYdwKUwMt+qB11FxyD4hMAywnjeEEjS+z7LE4+obVYYTXmAHHR0T0xA9LhlElwnZU24CzVrQOKaRWdCK+CDLRouYJ73OVeC0HVOY+P3wmQPFO8cDDrbnHd8daVezXOJFjm1jw0XRTWV5AHk4E5LP9aT8BLGk3Y65tzEVtVgV1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612545548; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=zv/BwC5POPyWjWYZMgFmMVd8R/Xa4KoRgVF20B1JO98=; b=c/e1Q1uXJmiPwOoZQ7aXxwyA0QUYCTANdCZTFjJJlR7EGxUTMG8sZ05tg/Rp2APhnsJgRjFiRgY9cB+X0CccS33B8KnaYfS5k696cUmrqclTs06aSQOnGv/XpH5sEFGf+LwJFWpeNkEY7UcpP62dCexGXFyxphxDACVmOKcGLDI= 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 1612545548980268.20307444247464; Fri, 5 Feb 2021 09:19:08 -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-596-xtmI1IdIMsekwW2bKgIoHA-1; Fri, 05 Feb 2021 12:19:04 -0500 Received: by mail-ej1-f72.google.com with SMTP id k3so7152045ejr.16 for ; Fri, 05 Feb 2021 09:19:04 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id w3sm4185595eja.52.2021.02.05.09.19.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 09:19:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612545547; 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=zv/BwC5POPyWjWYZMgFmMVd8R/Xa4KoRgVF20B1JO98=; b=cUncx+ntrLTeeH82OW4VrrP7vUHN8LcgCKU1JCLckraHfR1LLKRd4nqvMakFmguzJWjli6 Fc1opl+L/vDKQyYP9XK4PKr4e+KXWbmxrd25mmZvdx3fJqqV9iTfv/zcdnCl5lC08DBTjD hKZHwLWxw7HP/FYqsRZnYpoe71P0WGg= X-MC-Unique: xtmI1IdIMsekwW2bKgIoHA-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=zv/BwC5POPyWjWYZMgFmMVd8R/Xa4KoRgVF20B1JO98=; b=j2rNaYY903UQgMRu19MpHTekaWO2WuRD/9mmEt7JL60pqfqFGo1xmujEWd+lOyIjyv UkBbjdB8bd0AjZiOtE/YOJRLI03MI6S3juhaslnMQiudyDpqqktc/QCJW2T6FAFJ0Jns y8GvhNykUXBqR1AmPsXa3aI1XDNfa8+1pniGi4SXDzsDlD3QcyRvUMt5Ckzhg9/s/avB vHbvakPBrpcgSBM2kpJO4OyfyPUZzXHe6H9HCRhvfg/4iVlig1DovlsvY5daM4h+CWZL xy/quvRO2vGveudf+9nMAHfeSLm1eyAXqx3b2Lpu78e3BsCr4+jIcwxaJ1CMtJ1eHJhI ZXmQ== X-Gm-Message-State: AOAM5311EOjXHtafxpN0XGt8YWBXVq3aaZuw/5sN6gQIy5HKSROfLO4P XiNZNgMFk5zTMudsS3b5AwB2OMffN33+Q55X/qkqjeeXaThuEefciEIop5xkg4Ofp5FatYP43RG TRfp3PkJLgm9R4g== X-Received: by 2002:a17:906:4a8b:: with SMTP id x11mr4807085eju.195.1612545543136; Fri, 05 Feb 2021 09:19:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJy4AESYMU1owVRhV9m92wtbzGYJ8Gn9txipWIFeVvltbcAMh1VARjUR13pA6qTP5yK+Gb16GA== X-Received: by 2002:a17:906:4a8b:: with SMTP id x11mr4807070eju.195.1612545543029; Fri, 05 Feb 2021 09:19:03 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Max Reitz , Peter Maydell , Stefan Hajnoczi , Eduardo Otubo , qemu-block@nongnu.org, Gerd Hoffmann , Aurelien Jarno , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Alex Williamson , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH v2 7/8] tests/fp/fp-test: Replace the word 'blacklist' Date: Fri, 5 Feb 2021 18:18:16 +0100 Message-Id: <20210205171817.2108907-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205171817.2108907-1-philmd@redhat.com> References: <20210205171817.2108907-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 Acked-by: Alex Benn=C3=A9e Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=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 19:43:45 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=1612545553; cv=none; d=zohomail.com; s=zohoarc; b=d0XiiQP/qPt2nZETA5znBV4PjidaY9Bw6UZlQg271y2OSoEzr7xLfX4IpeKG8msvi/4KwGtyLsYn9CmAmy6OYqjJhXFaadvbW859tkjKqwuObtAshBhUmVoWspCGT47vFC5EndwUvbYzg7970yT8REVl9thz8WRd1yTt/RZytWs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612545553; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=jTYlec3DE5eyW7rWtGioEjbN02m0/2QBAjfap4CY4WI=; b=JLxy7hpavKOXXQ8YJc3VeSMK4StzpF4wICMT5MyevqpNfTw4DCdy4EtvS/xSCgjK25ZdgSg372Fj5zA1uE3g5HEPcvwcXinzRBqSsoOQVY0LNA897qvpL5ZzlMsMXuR2uf0FuwTaazQr+Z/mYYl4O/VKUczUUaFKaavzwEs/x3I= 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 1612545553778212.84595238960662; Fri, 5 Feb 2021 09:19:13 -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-241-FZIvICwAMD6rCbTtEJ_O8A-1; Fri, 05 Feb 2021 12:19:11 -0500 Received: by mail-ed1-f70.google.com with SMTP id t9so7252818edd.3 for ; Fri, 05 Feb 2021 09:19:10 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id y13sm24601eds.25.2021.02.05.09.19.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 09:19:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612545552; 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=jTYlec3DE5eyW7rWtGioEjbN02m0/2QBAjfap4CY4WI=; b=M7jvX+TwXimk9NJ4AEpKVkYYGza5gVE0Swes5CdlUo+cGY/ls2D7mO9Qng9DUmMKgGzKqj ZgTfT/O3uxw55ElBH08Gp8zd8/t5gXzsNo7lyrIOO2vXYUHOkVNhLU1e9kqNapVQmmuum0 npK9uTKZmgppfFnpGGu4GLw3zb5wqto= X-MC-Unique: FZIvICwAMD6rCbTtEJ_O8A-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=jTYlec3DE5eyW7rWtGioEjbN02m0/2QBAjfap4CY4WI=; b=JteFHcVBSJ8WGJV3NkKWNxm14c18BzmRZW8kaEGWjQoHyRdL0Vcff7+96XQje3tBM4 8RCBuEc8Z6ab/rhKfrNSOGCByVApBJ6amcgdUKDiqHDwgs8Z/xg8rNtHwxBnhvlL1Hgi GR4z2ifZUr9cCMk9Kc9tHWEst4jtGJU7e5jlix5Ht+JUNmv0zN+F4mLZqp7QT62InaMj VGB4/oLaQV9B1gfQuqvkk1l5zpNkg37yCDnDr9NLElpQcbkjl25FehJjJGZPOS1PnftF H+0ElZUnPIP6gS+f2Vxcl75iWWO0AMGEQELtrixCzz66mGXmwFABw+HfLbWa838/Q1sb kOmg== X-Gm-Message-State: AOAM530bJplKiHftGKh2q/qyyVtCjJSPDL6B65VTwHco+IkPxJsehk2+ LD8TkdHO9f9NcHrLD5cuK7992ftq+oEn+JUBCuAZcVaVpwsph/moZ47tetkKjjIrTlH8EiVB0jd Ulq943qlVG6c6EQ== X-Received: by 2002:a17:906:17d5:: with SMTP id u21mr4945656eje.109.1612545549302; Fri, 05 Feb 2021 09:19:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzhSmRMkYjO1R0jbAtS+p1wKUp0IRLnnPdDa+hLPZwjzozngFxtV1EClU4OCtJpmLSTECu7IQ== X-Received: by 2002:a17:906:17d5:: with SMTP id u21mr4945623eje.109.1612545549091; Fri, 05 Feb 2021 09:19:09 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Max Reitz , Peter Maydell , Stefan Hajnoczi , Eduardo Otubo , qemu-block@nongnu.org, Gerd Hoffmann , Aurelien Jarno , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Alex Williamson , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH v2 8/8] hw/vfio/pci-quirks: Replace the word 'blacklist' Date: Fri, 5 Feb 2021 18:18:17 +0100 Message-Id: <20210205171817.2108907-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205171817.2108907-1-philmd@redhat.com> References: <20210205171817.2108907-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 Reviewed-by: Alex Williamson Acked-by: Alex Williamson Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=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