From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Eduardo Otubo" <otubo@redhat.com>,
"Kevin Wolf" <kwolf@redhat.com>,
qemu-block@nongnu.org, "Peter Maydell" <peter.maydell@linaro.org>,
"Michael Roth" <michael.roth@amd.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PATCH 12/12] hw/vfio/pci-quirks: Replace the word 'blacklist'
Date: Tue, 2 Feb 2021 21:58:24 +0100 [thread overview]
Message-ID: <20210202205824.1085853-13-philmd@redhat.com> (raw)
In-Reply-To: <20210202205824.1085853-1-philmd@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é <philmd@redhat.com>
---
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 size);
-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[] = {
+} rom_denylist[] = {
{ 0x14e4, 0x168e }, /* Broadcom BCM 57810 */
};
-bool vfio_blacklist_opt_rom(VFIOPCIDevice *vdev)
+bool vfio_opt_rom_in_denylist(VFIOPCIDevice *vdev)
{
int i;
- for (i = 0 ; i < ARRAY_SIZE(romblacklist); i++) {
- if (vfio_pci_is(vdev, romblacklist[i].vendor, romblacklist[i].device)) {
- trace_vfio_quirk_rom_blacklisted(vdev->vbasedev.name,
- romblacklist[i].vendor,
- romblacklist[i].device);
+ for (i = 0 ; i < ARRAY_SIZE(rom_denylist); i++) {
+ if (vfio_pci_is(vdev, rom_denylist[i].vendor, rom_denylist[i].device)) {
+ 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)
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;
}
- 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"
# 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 * region_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
--
2.26.2
next prev parent reply other threads:[~2021-02-02 21:09 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-02 20:58 [PATCH 00/12] misc: Replace the words 'blacklist/whitelist' Philippe Mathieu-Daudé
2021-02-02 20:58 ` [PATCH 01/12] ui: Replace the word 'whitelist' Philippe Mathieu-Daudé
2021-02-03 9:43 ` Gerd Hoffmann
2021-02-03 10:04 ` Daniel P. Berrangé
2021-02-04 9:04 ` Philippe Mathieu-Daudé
2021-02-02 20:58 ` [PATCH 02/12] qga: Rename config key 'blacklist' as 'denylist' Philippe Mathieu-Daudé
2021-02-03 10:17 ` Daniel P. Berrangé
2021-02-04 9:45 ` Michal Suchánek
2021-02-04 12:29 ` Michal Suchánek
2021-02-02 20:58 ` [PATCH 03/12] qga: Replace '--blacklist' command line option by '--denylist' Philippe Mathieu-Daudé
2021-02-03 10:09 ` Daniel P. Berrangé
2021-02-03 12:45 ` BALATON Zoltan
2021-02-03 15:47 ` Kevin Wolf
2021-02-03 16:02 ` Michael Roth
2022-07-18 16:17 ` Thomas Huth
2021-02-02 20:58 ` [PATCH 04/12] qga: Replace the word 'blacklist' Philippe Mathieu-Daudé
2021-02-03 10:10 ` Daniel P. Berrangé
2021-02-02 20:58 ` [PATCH 05/12] tools/virtiofsd: Replace the word 'whitelist' Philippe Mathieu-Daudé
2021-02-03 9:08 ` Dr. David Alan Gilbert
2021-02-03 10:11 ` Daniel P. Berrangé
2021-02-02 20:58 ` [PATCH 06/12] scripts/tracetool: " Philippe Mathieu-Daudé
2021-02-03 10:12 ` Daniel P. Berrangé
2021-02-03 14:31 ` Stefan Hajnoczi
2021-02-02 20:58 ` [PATCH 07/12] scripts/device-crash-test: " Philippe Mathieu-Daudé
2021-02-03 9:14 ` Philippe Mathieu-Daudé
2021-02-03 10:14 ` Daniel P. Berrangé
2021-02-02 20:58 ` [PATCH 08/12] seccomp: Replace the word 'blacklist' Philippe Mathieu-Daudé
2021-02-03 10:15 ` Daniel P. Berrangé
2021-02-03 10:41 ` Eduardo Otubo
2021-02-02 20:58 ` [PATCH 09/12] qemu-options: " Philippe Mathieu-Daudé
2021-02-03 10:25 ` Daniel P. Berrangé
2021-02-04 9:09 ` Philippe Mathieu-Daudé
2021-02-02 20:58 ` [PATCH 10/12] tests/qemu-iotests: Replace the words 'blacklist/whitelist' Philippe Mathieu-Daudé
2021-02-03 10:28 ` Daniel P. Berrangé
2021-02-03 15:41 ` Kevin Wolf
2021-02-03 15:50 ` Daniel P. Berrangé
2021-02-02 20:58 ` [PATCH 11/12] tests/fp/fp-test: Replace the word 'blacklist' Philippe Mathieu-Daudé
2021-02-03 9:20 ` Alex Bennée
2021-02-03 10:29 ` Daniel P. Berrangé
2021-02-02 20:58 ` Philippe Mathieu-Daudé [this message]
2021-02-02 22:13 ` [PATCH 12/12] hw/vfio/pci-quirks: " Alex Williamson
2021-02-03 10:30 ` Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210202205824.1085853-13-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=alex.williamson@redhat.com \
--cc=aurelien@aurel32.net \
--cc=dgilbert@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=michael.roth@amd.com \
--cc=mreitz@redhat.com \
--cc=otubo@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).