From nobody Tue Nov 18 19:43:48 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