From nobody Sat Apr 20 11:35:10 2024 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=libvir-list-bounces@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=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605472986; cv=none; d=zohomail.com; s=zohoarc; b=Hm5lVUkx/VptOIO58L5M5xB1VsI9+ePeZYrZCwKge24jyuJ6J7X2Q4OJQ9e29VvJWezHZUHcawTHWYQxkyq9cAET47NshqtExCIEWuRAM2HarYSptteiD81+byDT0xcR1/RKfDdWLfj7WcD7hC37UJ/2dPZRBXBm998eNkyHiHE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605472986; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=3b5XdGb3G/PgJFrPCJxVOD8VsL5ApwmhfNQEj26aWs0=; b=HWTA/GXRW4xlw5Qh7eUOOH/G/UNJ+T+u2HKPEekiLpR58UncJbLr2B3e9GnTw+YWvECPL9WIzZwNAXBMdSivPAIfVACgO3L45bYTqeYk01bgPaZ2XLsscu8Zc4ejmkeJ/R93EdckhmJ73SYeRvkbPVc8H/VEMHkebAGAF0TclkU= 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=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: 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 1605472986533539.7060986753809; Sun, 15 Nov 2020 12:43:06 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-329-_0qIwGy1MU6jLI7qPHHZ8g-1; Sun, 15 Nov 2020 15:42:59 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 260A71007461; Sun, 15 Nov 2020 20:42:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 221AA5C5FE; Sun, 15 Nov 2020 20:42:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A0E661800B6C; Sun, 15 Nov 2020 20:42:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AFKgiDR027871 for ; Sun, 15 Nov 2020 15:42:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id C955D6EF45; Sun, 15 Nov 2020 20:42:44 +0000 (UTC) Received: from carol.localdomain (unknown [10.40.192.179]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B11646BF6B; Sun, 15 Nov 2020 20:42:41 +0000 (UTC) Received: from carol.redhat.com (carol.k8r.cz [127.0.0.1]) by carol.localdomain (Postfix) with ESMTP id 42391C2075E; Sun, 15 Nov 2020 21:42:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605472982; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=3b5XdGb3G/PgJFrPCJxVOD8VsL5ApwmhfNQEj26aWs0=; b=IeE9zkhKgfXZ8dNoOhBcQyGaRrzWVS1C/WJV2zAfnmRpoH33LCWUWDFjiZZ2CwiO9+Xjyj BRl69kRCdpfIU225WbofNUaa5yRm/KJYuiffuW9TdEeeylUjT3TDJ5nvzut02b7ssNutOJ IS1BrxbEzpxvxw8EfCl0g3H2Cf28esE= X-MC-Unique: _0qIwGy1MU6jLI7qPHHZ8g-1 From: Martin Kletzander To: libvir-list@redhat.com Subject: [libvirt PATCH] Do not disable incompatible-pointer-types-discards-qualifiers Date: Sun, 15 Nov 2020 21:42:40 +0100 Message-Id: <1cb89bfc8bf7f60bc86093de6fa4c8f6a54408f7.1605472909.git.mkletzan@redhat.com> MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This reverts commit b3710e9a2af402a2b620de570b062294e11190eb. That check is very valuable for our code, but it causes issue with glib >= =3D 2.67.0 when building with clang. The reason is a combination of two commits in glib, firstly fdda405b6b1b wh= ich adds a g_atomic_pointer_{set,get} variants that enforce stricter type checking (by removing an extra cast) for compilers that support __typeof__,= and commit dce24dc4492d which effectively enabled the new variant of glib's ato= mic code for clang. This will not be necessary when glib's issue #600 [0] (8 y= ears old) is fixed. Thankfully, MR #1719 [1], which is supposed to deal with th= is issue was opened 3 weeks ago, so there is a slight sliver of hope. [0] https://gitlab.gnome.org/GNOME/glib/-/issues/600 [1] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719 Signed-off-by: Martin Kletzander --- meson.build | 3 --- src/qemu/qemu_domain.c | 7 +++++++ src/util/vireventthread.c | 6 ++++++ src/util/viridentity.c | 6 ++++++ src/util/virobject.c | 6 ++++++ 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index cecaad199d4c..04646e3a078c 100644 --- a/meson.build +++ b/meson.build @@ -405,9 +405,6 @@ cc_flags +=3D [ # so use this Clang-specific arg to keep it quiet '-Wno-typedef-redefinition', =20 - # Clang complains about casts in G_DEFINE_TYPE(...) - '-Wno-incompatible-pointer-types-discards-qualifiers', - # We don't use -Wc++-compat so we have to enable it explicitly '-Wjump-misses-init', =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2158080a56ad..3349476cceae 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -330,7 +330,14 @@ struct _qemuDomainLogContext { virLogManagerPtr manager; }; =20 +#pragma clang diagnostic push +/* Workaround for glib's issue #600 on clang */ +#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qu= alifiers" + G_DEFINE_TYPE(qemuDomainLogContext, qemu_domain_log_context, G_TYPE_OBJECT= ); + +#pragma clang diagnostic pop + static virClassPtr qemuDomainSaveCookieClass; =20 static void qemuDomainLogContextFinalize(GObject *obj); diff --git a/src/util/vireventthread.c b/src/util/vireventthread.c index 8342f420f666..4e202c94d0f0 100644 --- a/src/util/vireventthread.c +++ b/src/util/vireventthread.c @@ -32,8 +32,14 @@ struct _virEventThread { GMainLoop *loop; }; =20 +#pragma clang diagnostic push +/* Workaround for glib's issue #600 on clang */ +#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qu= alifiers" + G_DEFINE_TYPE(virEventThread, vir_event_thread, G_TYPE_OBJECT) =20 +#pragma clang diagnostic pop + #define VIR_FROM_THIS VIR_FROM_EVENT =20 static void diff --git a/src/util/viridentity.c b/src/util/viridentity.c index 2cb9042a846a..43f447f629fe 100644 --- a/src/util/viridentity.c +++ b/src/util/viridentity.c @@ -50,8 +50,14 @@ struct _virIdentity { virTypedParameterPtr params; }; =20 +#pragma clang diagnostic push +/* Workaround for glib's issue #600 on clang */ +#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qu= alifiers" + G_DEFINE_TYPE(virIdentity, vir_identity, G_TYPE_OBJECT) =20 +#pragma clang diagnostic pop + static virThreadLocal virIdentityCurrent; =20 static void virIdentityFinalize(GObject *obj); diff --git a/src/util/virobject.c b/src/util/virobject.c index a6305354c35e..8d1f26618334 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -53,8 +53,14 @@ struct _virObjectPrivate { }; =20 =20 +#pragma clang diagnostic push +/* Workaround for glib's issue #600 on clang */ +#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qu= alifiers" + G_DEFINE_TYPE_WITH_PRIVATE(virObject, vir_object, G_TYPE_OBJECT) =20 +#pragma clang diagnostic pop + #define VIR_OBJECT_NOTVALID(obj) (!obj || !VIR_IS_OBJECT(obj)) =20 #define VIR_OBJECT_USAGE_PRINT_WARNING(anyobj, objclass) \ --=20 2.29.2