From nobody Sat May 18 08:46:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1690554546; cv=none; d=zohomail.com; s=zohoarc; b=Q/5oV0kO0mjhNGm+HtHP/+6kU8HWKvAYHEmAKpEvu9idxesvbU9yLMpBxriVqcgS4Jcsj9xp9iSHaQYhZGV7sicg948DlhbCs9pD/NsNgg8/Jixx5U38id/z0Gih1b+XXQGVpv7+4EpHLfMwM+Vr/EZrNo1UmX60wQYQF8paWAc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690554546; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LQmhjo8RjbUqK445IeqtyK1kET66BjgUGNVl6cghzuc=; b=HBdYoWnLO1LNCjSgH8pmBAJOf07xOEPqdpdskWPjoarVcGwenMLOTlzWkw7VwVA78tYT2yrttUMs/MHAlKj61MRpp72v7s5GtbLrQVIb0VX/m93egsk8Zw5jeeXGQeuu+AwX1rhrpyWRje/eKJ2NLQI9eG5NWAPstjYiV35+0GU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16905545464191009.2967780998414; Fri, 28 Jul 2023 07:29:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPORn-0002ui-Ua; Fri, 28 Jul 2023 10:28:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPORm-0002tz-Mp for qemu-devel@nongnu.org; Fri, 28 Jul 2023 10:28:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPORk-0006wx-Tr for qemu-devel@nongnu.org; Fri, 28 Jul 2023 10:28:02 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-134-UyhuAOZYM6mv0aiSxv6ewQ-1; Fri, 28 Jul 2023 10:27:53 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8CDCA803FEF; Fri, 28 Jul 2023 14:27:53 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A7A540C2063; Fri, 28 Jul 2023 14:27:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690554480; 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=LQmhjo8RjbUqK445IeqtyK1kET66BjgUGNVl6cghzuc=; b=imNoOeSZTFPE4HK4L71HaR8rStTiR+d7hzaLLs6ohglLZqPyM/tLGze8k5tnrUSK8NUrtF 6bIMS+1cM53Ct1W3lxRWbb0mEhhNnlE95nRaDNoU1wdIv7hk2hX9K8xIrtofPSLXkGEQEG 9fG6amVboxKuEnC6OcRxCN9h/tQWKDk= X-MC-Unique: UyhuAOZYM6mv0aiSxv6ewQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Cc: Stefan Weil , Yonggang Luo , Peter Maydell Subject: [RFC PATCH 1/6] gitlab: remove duplication between msys jobs Date: Fri, 28 Jul 2023 16:27:43 +0200 Message-Id: <20230728142748.305341-2-thuth@redhat.com> In-Reply-To: <20230728142748.305341-1-thuth@redhat.com> References: <20230728142748.305341-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1690554548094100001 From: Daniel P. Berrang=C3=A9 Although they share a common parent, the two msys jobs still have massive duplication in their script definitions that can easily be collapsed. Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20230726161942.229093-1-berrange@redhat.com> Signed-off-by: Thomas Huth --- .gitlab-ci.d/windows.yml | 132 +++++++++++++++------------------------ 1 file changed, 49 insertions(+), 83 deletions(-) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index f889a468b5..f086540e40 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -35,97 +35,63 @@ - .\msys64\usr\bin\bash -lc 'pacman --noconfirm -Syuu' # Core update - .\msys64\usr\bin\bash -lc 'pacman --noconfirm -Syuu' # Normal update - taskkill /F /FI "MODULES eq msys-2.0.dll" - -msys2-64bit: - extends: .shared_msys2_builder script: - .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed bison diffutils flex git grep make sed - mingw-w64-x86_64-capstone - mingw-w64-x86_64-curl - mingw-w64-x86_64-cyrus-sasl - mingw-w64-x86_64-dtc - mingw-w64-x86_64-gcc - mingw-w64-x86_64-glib2 - mingw-w64-x86_64-gnutls - mingw-w64-x86_64-gtk3 - mingw-w64-x86_64-libgcrypt - mingw-w64-x86_64-libjpeg-turbo - mingw-w64-x86_64-libnfs - mingw-w64-x86_64-libpng - mingw-w64-x86_64-libssh - mingw-w64-x86_64-libtasn1 - mingw-w64-x86_64-libusb - mingw-w64-x86_64-lzo2 - mingw-w64-x86_64-nettle - mingw-w64-x86_64-ninja - mingw-w64-x86_64-pixman - mingw-w64-x86_64-pkgconf - mingw-w64-x86_64-python - mingw-w64-x86_64-SDL2 - mingw-w64-x86_64-SDL2_image - mingw-w64-x86_64-snappy - mingw-w64-x86_64-spice - mingw-w64-x86_64-usbredir - mingw-w64-x86_64-zstd " + $MINGW_TARGET-capstone + $MINGW_TARGET-curl + $MINGW_TARGET-cyrus-sasl + $MINGW_TARGET-dtc + $MINGW_TARGET-gcc + $MINGW_TARGET-glib2 + $MINGW_TARGET-gnutls + $MINGW_TARGET-gtk3 + $MINGW_TARGET-libgcrypt + $MINGW_TARGET-libjpeg-turbo + $MINGW_TARGET-libnfs + $MINGW_TARGET-libpng + $MINGW_TARGET-libssh + $MINGW_TARGET-libtasn1 + $MINGW_TARGET-libusb + $MINGW_TARGET-lzo2 + $MINGW_TARGET-nettle + $MINGW_TARGET-ninja + $MINGW_TARGET-pixman + $MINGW_TARGET-pkgconf + $MINGW_TARGET-python + $MINGW_TARGET-SDL2 + $MINGW_TARGET-SDL2_image + $MINGW_TARGET-snappy + $MINGW_TARGET-spice + $MINGW_TARGET-usbredir + $MINGW_TARGET-zstd " - $env:CHERE_INVOKING =3D 'yes' # Preserve the current working directory - - $env:MSYSTEM =3D 'MINGW64' # Start a 64-bit MinGW environment - $env:MSYS =3D 'winsymlinks:native' # Enable native Windows symlink - mkdir build - cd build - # Note: do not remove "--without-default-devices"! - # commit 9f8e6cad65a6 ("gitlab-ci: Speed up the msys2-64bit job by using= --without-default-devices" - # changed to compile QEMU with the --without-default-devices switch - # for the msys2 64-bit job, due to the build could not complete within - # the project timeout. - - ..\msys64\usr\bin\bash -lc '../configure --target-list=3Dx86_64-softmmu - --without-default-devices --enable-fdt=3Dsystem' - - ..\msys64\usr\bin\bash -lc 'make' - # qTests don't run successfully with "--without-default-devices", - # so let's exclude the qtests from CI for now. - - ..\msys64\usr\bin\bash -lc 'make check MTESTARGS=3D\"--no-suite qtest\= " || { cat meson-logs/testlog.txt; exit 1; } ;' + - ..\msys64\usr\bin\bash -lc "../configure --enable-fdt=3Dsystem $CONFIG= URE_ARGS" + - ..\msys64\usr\bin\bash -lc "make" + - ..\msys64\usr\bin\bash -lc "make check MTESTARGS=3D'$TEST_ARGS' || { c= at meson-logs/testlog.txt; exit 1; } ;" + +msys2-64bit: + extends: .shared_msys2_builder + variables: + MINGW_TARGET: mingw-w64-x86_64 + MSYSTEM: MINGW64 + # do not remove "--without-default-devices"! + # commit 9f8e6cad65a6 ("gitlab-ci: Speed up the msys2-64bit job by usi= ng --without-default-devices" + # changed to compile QEMU with the --without-default-devices switch + # for the msys2 64-bit job, due to the build could not complete within + CONFIGURE_ARGS: --target-list=3Dx86_64-softmmu --without-default-devi= ces + # qTests don't run successfully with "--without-default-devices", + # so let's exclude the qtests from CI for now. + TEST_ARGS: --no-suite qtest =20 msys2-32bit: extends: .shared_msys2_builder - script: - - .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed - bison diffutils flex - git grep make sed - mingw-w64-i686-capstone - mingw-w64-i686-curl - mingw-w64-i686-cyrus-sasl - mingw-w64-i686-dtc - mingw-w64-i686-gcc - mingw-w64-i686-glib2 - mingw-w64-i686-gnutls - mingw-w64-i686-gtk3 - mingw-w64-i686-libgcrypt - mingw-w64-i686-libjpeg-turbo - mingw-w64-i686-libnfs - mingw-w64-i686-libpng - mingw-w64-i686-libssh - mingw-w64-i686-libtasn1 - mingw-w64-i686-libusb - mingw-w64-i686-lzo2 - mingw-w64-i686-nettle - mingw-w64-i686-ninja - mingw-w64-i686-pixman - mingw-w64-i686-pkgconf - mingw-w64-i686-python - mingw-w64-i686-SDL2 - mingw-w64-i686-SDL2_image - mingw-w64-i686-snappy - mingw-w64-i686-spice - mingw-w64-i686-usbredir - mingw-w64-i686-zstd " - - $env:CHERE_INVOKING =3D 'yes' # Preserve the current working directory - - $env:MSYSTEM =3D 'MINGW32' # Start a 32-bit MinGW environment - - $env:MSYS =3D 'winsymlinks:native' # Enable native Windows symlink - - mkdir build - - cd build - - ..\msys64\usr\bin\bash -lc '../configure --target-list=3Dppc64-softmmu - --enable-fdt=3Dsystem' - - ..\msys64\usr\bin\bash -lc 'make' - - ..\msys64\usr\bin\bash -lc 'make check MTESTARGS=3D\"--no-suite qtest\= " || - { cat meson-logs/testlog.txt; exit 1; }' + variables: + MINGW_TARGET: mingw-w64-i686 + MSYSTEM: MINGW32 + CONFIGURE_ARGS: --target-list=3Dppc64-softmmu + TEST_ARGS: --no-suite qtest --=20 2.39.3 From nobody Sat May 18 08:46:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1690554609; cv=none; d=zohomail.com; s=zohoarc; b=NezUuzWmT+en9BBETu8EQF+4d01On5KJ/8Qiq4y3xyZi9M+sQzW6Iv4aiarTZcBsBaF+G5EFLxJqtkT7LoMsDiGiiNiruZVoCf7mz0DQQQsPk3ovPxWNXMMs3IHkwjeV65X5mDfE04GSAurBipwqP3iS+LKc04dUAFS4A49MFzI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690554609; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BzUtBZcualb0Ub4F+nHEOYiqStiqkG2bXaJZn4uT5Tc=; b=F72GwYtZwVuWzX8V/IcnDFumWW/6plNdOjg81mnoS0D9bkoZsribURvgb9fz9KFBoksLX1e12CrtJ6Tr4c4lBNkou7/QdrTAc/9X4ABDrVpMfP77UctvQYJL8cgBivwH7977u46UhYPLbD19q/55/lGyDYrB5vFZmf+Yp5HeihE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1690554609675703.9681192558064; Fri, 28 Jul 2023 07:30:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPORn-0002uI-7X; Fri, 28 Jul 2023 10:28:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPORl-0002te-8G for qemu-devel@nongnu.org; Fri, 28 Jul 2023 10:28:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPORj-0006wN-Pz for qemu-devel@nongnu.org; Fri, 28 Jul 2023 10:28:01 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-194-5_4BTGk7M1Sv79RK8AG2pg-1; Fri, 28 Jul 2023 10:27:55 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EF1008030AC; Fri, 28 Jul 2023 14:27:54 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD41940C2063; Fri, 28 Jul 2023 14:27:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690554479; 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=BzUtBZcualb0Ub4F+nHEOYiqStiqkG2bXaJZn4uT5Tc=; b=cdvxoG4HvKu/NRSnZ6DpNy/VJcAtkRGEWnyysH+AGm4Tl99aItt/l28rNpy/ZHLd3t/pmz t2C/Eqa/U0X6yzWydjO1DwjKgx3oRPJl9J+143pMuHfDgt/bDAxCkOkMsUgXLKifp6XzJw eKspRA2bXoFj71y/pr9Ejf9dHDOLi0g= X-MC-Unique: 5_4BTGk7M1Sv79RK8AG2pg-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Cc: Stefan Weil , Yonggang Luo , Peter Maydell Subject: [RFC PATCH 2/6] ui/dbus: fix clang compilation issue Date: Fri, 28 Jul 2023 16:27:44 +0200 Message-Id: <20230728142748.305341-3-thuth@redhat.com> In-Reply-To: <20230728142748.305341-1-thuth@redhat.com> References: <20230728142748.305341-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1690554610530100001 From: Marc-Andr=C3=A9 Lureau ../ui/dbus-listener.c:236:9: error: expected expression Error *err =3D NULL; See: https://gitlab.com/qemu-project/qemu/-/issues/1782#note_1488517427 Reviewed-by: Thomas Huth Signed-off-by: Marc-Andr=C3=A9 Lureau --- ui/dbus-listener.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c index 68ff343799..2657d9f8bb 100644 --- a/ui/dbus-listener.c +++ b/ui/dbus-listener.c @@ -232,7 +232,7 @@ static void dbus_call_update_gl(DisplayChangeListener *= dcl, egl_fb_read_rect(ddl->ds, &ddl->fb, x, y, w, h); dbus_gfx_update(dcl, x, y, w, h); break; - case SHARE_KIND_D3DTEX: + case SHARE_KIND_D3DTEX: { Error *err =3D NULL; assert(ddl->d3d_texture); =20 @@ -249,6 +249,7 @@ static void dbus_call_update_gl(DisplayChangeListener *= dcl, dbus_update_gl_cb, g_object_ref(ddl)); break; + } default: g_warn_if_reached(); } --=20 2.39.3 From nobody Sat May 18 08:46:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1690555421; cv=none; d=zohomail.com; s=zohoarc; b=aKE4c8uIR6qq6Hk2GbrrkuBjMfKxOtEipXog7Iw21mQeYR9AuerwTdIADio/OiIvN/Fh3YN2xyFtKyawBtvSOmjEDbCdiqyZB9Vn4c4mepSWSPeMyaT+Fm3qUA3tgpQ3bwwPVAvMoLjm6UDHRL7GWkJXe1LWv00x8v6Nbt6yTdQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690555421; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KdUDJzaz8CxhPvn2ukbUEi+atwv9AJtALsvUOJ7KrpM=; b=GjDDyK4F6XUFsJChaRlVPi7in57tXMQTUa5rgAKrIAF/7Cxm/2QsHccnFOWyF3YnAh7tq0CnmRiBQdYi8tfbGcikyFnZoAM6jUZkm//1Mu31nOtmFp5gXTgQbVmEHkeIwH6G6n2q6mA9nJf4Fx25ItSnE3a3DAl9zzo84K85Jpc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1690555421806386.11871297806783; Fri, 28 Jul 2023 07:43:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPORp-0002vD-P7; Fri, 28 Jul 2023 10:28:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPORm-0002tv-I9 for qemu-devel@nongnu.org; Fri, 28 Jul 2023 10:28:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPORl-0006wy-6F for qemu-devel@nongnu.org; Fri, 28 Jul 2023 10:28:02 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-604-UJ0X3zN8O0GtLV3wGfI3BQ-1; Fri, 28 Jul 2023 10:27:56 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5E2C080027F; Fri, 28 Jul 2023 14:27:56 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A81340C206F; Fri, 28 Jul 2023 14:27:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690554480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KdUDJzaz8CxhPvn2ukbUEi+atwv9AJtALsvUOJ7KrpM=; b=JcFVtqlNKLJQYslGDPFnD43PRxlsgUO5CUsFKHcJ6U/v5DILHzb3pERAduVVG4Tjutsvfc raZGUE3cqT7MDjPoqNJQywaR5vst9p0tuXq/TuSyOcK3Gyynswtp1DDoUq02BY1NSm4k3C 1O4ja/7sonBK2m1kkhz0H5T8A9iENKg= X-MC-Unique: UJ0X3zN8O0GtLV3wGfI3BQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Cc: Stefan Weil , Yonggang Luo , Peter Maydell Subject: [RFC PATCH 3/6] util/oslib-win32: Fix compiling with Clang from MSYS2 Date: Fri, 28 Jul 2023 16:27:45 +0200 Message-Id: <20230728142748.305341-4-thuth@redhat.com> In-Reply-To: <20230728142748.305341-1-thuth@redhat.com> References: <20230728142748.305341-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1690555424016100003 Content-Type: text/plain; charset="utf-8" Clang complains: ../util/oslib-win32.c:483:56: error: omitting the parameter name in a function definition is a C2x extension [-Werror,-Wc2x-extensions] win32_close_exception_handler(struct _EXCEPTION_RECORD*, ^ Fix it by adding parameter names. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- util/oslib-win32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 429542face..070bb455d3 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -480,8 +480,8 @@ int qemu_bind_wrap(int sockfd, const struct sockaddr *a= ddr, } =20 EXCEPTION_DISPOSITION -win32_close_exception_handler(struct _EXCEPTION_RECORD*, - void*, struct _CONTEXT*, void*) +win32_close_exception_handler(struct _EXCEPTION_RECORD *exrec, + void *ptr1, struct _CONTEXT *cntx, void *ptr= 2) { return EXCEPTION_EXECUTE_HANDLER; } --=20 2.39.3 From nobody Sat May 18 08:46:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1690555543; cv=none; d=zohomail.com; s=zohoarc; b=MXa29EO3QQFlAXVVmf3am3mUp4+YCap7+w1VyZKk+vAseOtTrLlRwIQF0nn39oyMj4657+Vp+fu5599fRDb7d1jxiwE3pKqLx8VUWJyOiADVOFhFu7jn8IwKrfqqfj7TEKuBOaf3tM13JJ24FtxmG0vyuhvcGlWk8Ti/9Rs9vow= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690555543; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bMtECrFmf0lC7U3IiFxWuYmpCKS2BR0qcY3sUID0KiY=; b=DkSDxEhBduEAFq6O8i7vhxl/nuBzWezCqpITMJMITQ7AvJ8F0+hzWkUfglyG88zEOorp6KJ6VOWu9yi5J41Be4Q4jnEY+ayMRhhD3MZusyell3Vpn1aru/PRXrL2NpO/Nh/OGIr43utVFoR7V+OFL5UpliFNFZ8bBLzofPEOLmw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1690555543347597.4302815008475; Fri, 28 Jul 2023 07:45:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPORp-0002v7-GM; Fri, 28 Jul 2023 10:28:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPORl-0002tm-W7 for qemu-devel@nongnu.org; Fri, 28 Jul 2023 10:28:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPORk-0006wn-F7 for qemu-devel@nongnu.org; Fri, 28 Jul 2023 10:28:01 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-606-JNu256DoMu2RvKP6Q8NYWw-1; Fri, 28 Jul 2023 10:27:58 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BD7FB8022EF; Fri, 28 Jul 2023 14:27:57 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id A20B340C2063; Fri, 28 Jul 2023 14:27:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690554479; 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=bMtECrFmf0lC7U3IiFxWuYmpCKS2BR0qcY3sUID0KiY=; b=NAAWqFLR52SaYWLPLPwZjo8DK6EBfp37/OXeHl6ZDErj6uZIfkr2d2dq89e19Si+VIaDSK Zz6PyJGJIjFejdhpl/O4KZ1JoEp7aI9XWVqaCtwv0KWNUKtPiXxjfKdorF/OwJL/CWvxlo ZKAxu2ZZ5vBdk2LvU1z6bjnwpPH2PX0= X-MC-Unique: JNu256DoMu2RvKP6Q8NYWw-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Cc: Stefan Weil , Yonggang Luo , Peter Maydell Subject: [RFC PATCH 4/6] hw/i386/intel_iommu: Fix VTD_IR_TableEntry for ms_struct layout Date: Fri, 28 Jul 2023 16:27:46 +0200 Message-Id: <20230728142748.305341-5-thuth@redhat.com> In-Reply-To: <20230728142748.305341-1-thuth@redhat.com> References: <20230728142748.305341-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1690555543764100001 We might want to compile QEMU with Clang on Windows - but it does not support the __attribute__((gcc_struct)) yet. So we have to make sure that the structs will stay the same when the compiler uses the "ms_struct" layout. The VTD_IR_TableEntry struct is affected - rewrite it a little bit so that it works fine with both struct layouts. Reported-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- include/hw/i386/intel_iommu.h | 14 ++++++++------ hw/i386/intel_iommu.c | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index 89dcbc5e1e..08bf220393 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -204,18 +204,20 @@ union VTD_IR_TableEntry { #endif uint32_t dest_id; /* Destination ID */ uint16_t source_id; /* Source-ID */ + uint16_t __reserved_2; /* Reserved 2 */ #if HOST_BIG_ENDIAN - uint64_t __reserved_2:44; /* Reserved 2 */ - uint64_t sid_vtype:2; /* Source-ID Validation Type */ - uint64_t sid_q:2; /* Source-ID Qualifier */ + uint32_t __reserved_3:28; /* Reserved 3 */ + uint32_t sid_vtype:2; /* Source-ID Validation Type */ + uint32_t sid_q:2; /* Source-ID Qualifier */ #else - uint64_t sid_q:2; /* Source-ID Qualifier */ - uint64_t sid_vtype:2; /* Source-ID Validation Type */ - uint64_t __reserved_2:44; /* Reserved 2 */ + uint32_t sid_q:2; /* Source-ID Qualifier */ + uint32_t sid_vtype:2; /* Source-ID Validation Type */ + uint32_t __reserved_3:28; /* Reserved 3 */ #endif } QEMU_PACKED irte; uint64_t data[2]; }; +QEMU_BUILD_BUG_ON(sizeof(union VTD_IR_TableEntry) !=3D 16); =20 #define VTD_IR_INT_FORMAT_COMPAT (0) /* Compatible Interrupt */ #define VTD_IR_INT_FORMAT_REMAP (1) /* Remappable Interrupt */ diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index dcc334060c..d5c5ee0751 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3335,7 +3335,7 @@ static int vtd_irte_get(IntelIOMMUState *iommu, uint1= 6_t index, } =20 if (entry->irte.__reserved_0 || entry->irte.__reserved_1 || - entry->irte.__reserved_2) { + entry->irte.__reserved_2 || entry->irte.__reserved_3) { error_report_once("%s: detected non-zero reserved IRTE " "(index=3D%u, high=3D0x%" PRIx64 ", low=3D0x%" P= RIx64 ")", __func__, index, le64_to_cpu(entry->data[1]), --=20 2.39.3 From nobody Sat May 18 08:46:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1690555756; cv=none; d=zohomail.com; s=zohoarc; b=IdYBL/whlgClaO4GUhGkPo0rrmsKwLOes2jPvpQqm+T2m7AS8vRtKjwCLOFI3yBeuGpbKnRDOJQFF2A5vpYLAIMfno2yESokCcvN/mTUYKT1RO7TF6d7u6v9WAtwEx1Gk5sRnk+7e83UYo1b+FkhLU/ltofRzaxkNQMphbQwHbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690555756; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pKn8qZgM0+HTt4J6h+tKL2N1zvZKowBv/GfWd4sQipg=; b=CGMGEKmcwRzhGrkRZBWiitwNV0dXTjVODTcg+R5QUuOVkNc75R9MIqr1YHM2abvRDZdO8vI1hSVXxB846q/l3Dz240ZDui8B6ptywwwleQDhcnwE9o6//Cqbv8EbCkA6QqYa7ACB/FdxfCqBd1qwOAqVDR73Wh2d9co99IIgPAs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1690555756347557.2637178234365; Fri, 28 Jul 2023 07:49:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPORt-0002w6-CQ; Fri, 28 Jul 2023 10:28:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPORr-0002vY-PD for qemu-devel@nongnu.org; Fri, 28 Jul 2023 10:28:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPORp-0006xz-AK for qemu-devel@nongnu.org; Fri, 28 Jul 2023 10:28:07 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-463-hvJOUnSSO12LEhkK4lCt6Q-1; Fri, 28 Jul 2023 10:27:59 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 28EFE8022EF; Fri, 28 Jul 2023 14:27:59 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A5E740C2063; Fri, 28 Jul 2023 14:27:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690554483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pKn8qZgM0+HTt4J6h+tKL2N1zvZKowBv/GfWd4sQipg=; b=hotMf0dlH6PdKBOE77bJXd6CW7gZFkaFLLKgPMuNeAiXZ1kzfcjvK9HGU93wheSN12wJMr onpzD7TFs139Wsn27FHnlWPcnC37pMi4Dj9ZrKdHDUXYt47xdkMM/72ekTQgB0GctB8Ycm qRN373xv8EqFOrF7xqOiNiToPbu5a+A= X-MC-Unique: hvJOUnSSO12LEhkK4lCt6Q-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Cc: Stefan Weil , Yonggang Luo , Peter Maydell Subject: [RFC PATCH 5/6] include/qemu/compiler: Fix problem with gcc_struct and Clang Date: Fri, 28 Jul 2023 16:27:47 +0200 Message-Id: <20230728142748.305341-6-thuth@redhat.com> In-Reply-To: <20230728142748.305341-1-thuth@redhat.com> References: <20230728142748.305341-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1690555758435100003 Content-Type: text/plain; charset="utf-8" Clang on Windows does not seem to know the "gcc_struct" attribute and emits a warning when we try to use it. Add an additional check here with __has_attribute() to avoid this problem. Signed-off-by: Thomas Huth --- include/qemu/compiler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h index a309f90c76..5065b4447c 100644 --- a/include/qemu/compiler.h +++ b/include/qemu/compiler.h @@ -22,7 +22,7 @@ #define QEMU_EXTERN_C extern #endif =20 -#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__)) +#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__)) && !defi= ned(__clang__) # define QEMU_PACKED __attribute__((gcc_struct, packed)) #else # define QEMU_PACKED __attribute__((packed)) --=20 2.39.3 From nobody Sat May 18 08:46:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1690555613; cv=none; d=zohomail.com; s=zohoarc; b=NP/TzjzYHZHRLA1eko/t81QIPK/vNI814Ph0aamKRaY+s4Rc6amk3lls8IQpOdSFZtddjQTyc4Nqx5MOfdWankMag+gmnTZaFysGm66d637htx5RUV1Nz0IRrivST7A5OabslQ5tq/ME84NlWohCQy1sECNJ0BtMXbawEIszBgk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690555613; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6AUsO605mo1yE4/sLbpmZd3dIaRAPYWrlG6fvmbl5hE=; b=at/yd0faJCGyYq2Tf2Smx+H9ls2Ap1bzn5EOZtbjQ6EjiGQ3EscaoOq7RYkA6GJNwcKeZsnuDtBN0lv/2RLnn7T2P627LNPjaTvgIu1FqyIqzRJzlcjY+C8FLw3894xXjab77fBLqqg2LYuZgA68raMw7dzZPmN7qIb9Va3kfbY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1690555613350353.2541410052795; Fri, 28 Jul 2023 07:46:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPORs-0002vr-ES; Fri, 28 Jul 2023 10:28:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPORq-0002vP-NS for qemu-devel@nongnu.org; Fri, 28 Jul 2023 10:28:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPORp-0006yB-8A for qemu-devel@nongnu.org; Fri, 28 Jul 2023 10:28:06 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-107-raNa4HQINYWv5cCDK50Vmg-1; Fri, 28 Jul 2023 10:28:01 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8CFDB80027F; Fri, 28 Jul 2023 14:28:00 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69A2340C2063; Fri, 28 Jul 2023 14:27:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690554484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6AUsO605mo1yE4/sLbpmZd3dIaRAPYWrlG6fvmbl5hE=; b=Wtg5WWT/xhN4s9oT/2Y1alf/f+lqE4og3mgshg0NDScmEK/XeK71rYNHK6qPKs9/9//yV0 Xu4rb5Ef8UsQLu53SBsuIOh9imaIJQ4TiH9j0utx9iFGnRGyMznCGOSOlAwu2lVaQhCr9C PvqQBHVhr93LmKXRMo5FVPuPqdTe6p8= X-MC-Unique: raNa4HQINYWv5cCDK50Vmg-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Cc: Stefan Weil , Yonggang Luo , Peter Maydell Subject: [RFC PATCH 6/6] gitlab-ci.d/windows: Use Clang for compiling in the 64-bit MSYS2 job Date: Fri, 28 Jul 2023 16:27:48 +0200 Message-Id: <20230728142748.305341-7-thuth@redhat.com> In-Reply-To: <20230728142748.305341-1-thuth@redhat.com> References: <20230728142748.305341-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1690555615814100003 Content-Type: text/plain; charset="utf-8" We are struggeling with timeouts in the 64-bit MSYS2 job. Clang seems to be a little bit faster, so let's use this compiler now instead. There is a problem with compiling the spice headers with Clang, though, so we can only test this in the 32-bit builds with GCC now. And we have to disable dbus-display - otherwise the compilation aborts in the CI. Signed-off-by: Thomas Huth --- .gitlab-ci.d/windows.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index f086540e40..ff9e9af4bb 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -43,7 +43,6 @@ $MINGW_TARGET-curl $MINGW_TARGET-cyrus-sasl $MINGW_TARGET-dtc - $MINGW_TARGET-gcc $MINGW_TARGET-glib2 $MINGW_TARGET-gnutls $MINGW_TARGET-gtk3 @@ -63,9 +62,9 @@ $MINGW_TARGET-SDL2 $MINGW_TARGET-SDL2_image $MINGW_TARGET-snappy - $MINGW_TARGET-spice $MINGW_TARGET-usbredir - $MINGW_TARGET-zstd " + $MINGW_TARGET-zstd + $EXTRA_PACKAGES " - $env:CHERE_INVOKING =3D 'yes' # Preserve the current working directory - $env:MSYS =3D 'winsymlinks:native' # Enable native Windows symlink - mkdir build @@ -77,13 +76,15 @@ msys2-64bit: extends: .shared_msys2_builder variables: - MINGW_TARGET: mingw-w64-x86_64 - MSYSTEM: MINGW64 + MINGW_TARGET: mingw-w64-clang-x86_64 + MSYSTEM: CLANG64 + EXTRA_PACKAGES: binutils mingw-w64-clang-x86_64-clang # do not remove "--without-default-devices"! # commit 9f8e6cad65a6 ("gitlab-ci: Speed up the msys2-64bit job by usi= ng --without-default-devices" # changed to compile QEMU with the --without-default-devices switch # for the msys2 64-bit job, due to the build could not complete within - CONFIGURE_ARGS: --target-list=3Dx86_64-softmmu --without-default-devi= ces + CONFIGURE_ARGS: --target-list=3Dx86_64-softmmu --without-default-devic= es + --cc=3Dclang --disable-dbus-display # qTests don't run successfully with "--without-default-devices", # so let's exclude the qtests from CI for now. TEST_ARGS: --no-suite qtest @@ -93,5 +94,6 @@ msys2-32bit: variables: MINGW_TARGET: mingw-w64-i686 MSYSTEM: MINGW32 + EXTRA_PACKAGES: mingw-w64-i686-gcc mingw-w64-i686-spice CONFIGURE_ARGS: --target-list=3Dppc64-softmmu TEST_ARGS: --no-suite qtest --=20 2.39.3