Re: [PATCH 12/12] hw/vfio/pci-quirks: Replace the word 'blacklist'

[Alex Williamson <alex.williamson@redhat.com>]

On Tue,  2 Feb 2021 21:58:24 +0100
Philippe Mathieu-Daudé <philmd@redhat.com> wrote:

> Follow the inclusive terminology from the "Conscious Language in your
> Open Source Projects" guidelines [*] and replace the word "blacklist"
> appropriately.
> 
> [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md
> 
> 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(-)

Thanks!

Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Alex Williamson <alex.williamson@redhat.com>

> 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