From nobody Tue Nov 18 21:12:19 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