From patchwork Fri Mar 24 15:36:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 666555 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp536656wrt; Fri, 24 Mar 2023 08:50:03 -0700 (PDT) X-Google-Smtp-Source: AK7set+QjaD6GbP3dUvWPp6INm/ydUgqT/JwtpwtlYHxLuUBWinn8Kkv5DO2OLpho2YVl+yScI+4 X-Received: by 2002:ac8:5fd6:0:b0:3b8:4adb:c603 with SMTP id k22-20020ac85fd6000000b003b84adbc603mr4681022qta.60.1679673003294; Fri, 24 Mar 2023 08:50:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679673003; cv=none; d=google.com; s=arc-20160816; b=fMsk6GkA8QEL8q4ltnICitUmKmLtwm1LYMNI6jlRCVwImvoYgCpKWNd6L4XlCoD8zQ KuUvEAjsFExnixFfLA+fhuhjna/C1nDB+Cd0Q7XqyghZBQhXlNYtKNIGa1Lz5COUM0bj GlvG4AA4VAHjH8fIHSMlALUz97v3auQW1t3gDNIPs/ytfrCd9IWUmZbO6j2vgIv6ysiH mBMyQWl6NqYhTSyngR+1L9AWtRVfOkq+eWPFRDbMpH8tuseFrLq309IaH+UUG9sb/k93 kulsli5EecdVfJBjGu0+wEl3Vghy41c8JGqGCwnP2dCOe9X2+YTbfyGhvnVKzm700byx 7WJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JZi7OZJoIDBUiYpfz1MwO5wzGPzhZ/lJbxsxTaRuHjs=; b=GGdEPz65OLVUbL/p6BndIXCbMR91d987o3I+kB1wlXV/smqVpQHPmmBTLq1YhszAPb RMJipb7DymMtsIhD0h3cdZ1rw5kitm+29B6fYAFYDJXOfcuAnZjDyW3ficGKosxCggjp kkkfbuTErn5pfXdAQBK4HhvnF8ba9YVZAPGbOBTX0vXsUsU1wKUWg92pWA+lb+L9Ir5W Mjav0224sW2sR71oLwAJu/LbG519U3aSqIb36EBUSoxoF9yrBSeTZ0nxP848Amf1I3wK KYZ50hkTqvzp+fgUQf/5JhKOVfJ+hs9C1+cc2kZz6gOPkc4KPWsGX9WEvFjPM7nqOajC VqIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PlXHgVw+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x10-20020a05622a000a00b003dbcd1be236si13491251qtw.246.2023.03.24.08.50.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 Mar 2023 08:50:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PlXHgVw+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pfjT2-0005TO-OB; Fri, 24 Mar 2023 11:36:36 -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 1pfjT0-0005PX-Tg for qemu-devel@nongnu.org; Fri, 24 Mar 2023 11:36:34 -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 1pfjSz-0001lr-Bu for qemu-devel@nongnu.org; Fri, 24 Mar 2023 11:36:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679672192; 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=JZi7OZJoIDBUiYpfz1MwO5wzGPzhZ/lJbxsxTaRuHjs=; b=PlXHgVw+1NQaIe9KNCJZKroGIXVfY9zCyznUOCb2oRACQiTks0DwBN3v2t1SvWTGiE7jBG WmNFUQIY/Zd27DsDjqSFjMd2HGLIasCyLtgnLaBHsgdd/ku3QbAsW3NqxqP4v7jKgD+5Dr kBBeMbdwBIoBlAQ3ShLSV7DLdFa8Xj0= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-536-wOJB4aCHPs2VMnHSI8Drfg-1; Fri, 24 Mar 2023 11:36:27 -0400 X-MC-Unique: wOJB4aCHPs2VMnHSI8Drfg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DDB89280A335; Fri, 24 Mar 2023 15:36:26 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90DDB140EBF4; Fri, 24 Mar 2023 15:36:25 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , =?utf-8?q?Daniel_P_=2E_Be?= =?utf-8?q?rrang=C3=A9?= Subject: [PULL 6/8] gitlab-ci: Cover SPICE in the MSYS2 job Date: Fri, 24 Mar 2023 16:36:08 +0100 Message-Id: <20230324153610.224673-7-thuth@redhat.com> In-Reply-To: <20230324153610.224673-1-thuth@redhat.com> References: <20230324153610.224673-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Include the mingw-w64-x86_64-spice package so SPICE is covered: C compiler for the host machine: cc -m64 -mcx16 (gcc 12.2.0 "cc (Rev10, Built by MSYS2 project) 12.2.0") ... Run-time dependency spice-protocol found: YES 0.14.4 Run-time dependency spice-server found: YES 0.15.1 In particular this would have helped catching the build issue reported as https://gitlab.com/qemu-project/qemu/-/issues/1553: [1851/5253] Compiling C object libcommon.fa.p/ui_spice-core.c.obj FAILED: libcommon.fa.p/ui_spice-core.c.obj ../ui/spice-core.c: In function 'watch_remove': ../ui/spice-core.c:152:5: error: implicit declaration of function 'qemu_close_to_socket' [-Werror=implicit-function-declaration] 152 | qemu_close_to_socket(watch->fd); | ^~~~~~~~~~~~~~~~~~~~ ../ui/spice-core.c:152:5: error: nested extern declaration of 'qemu_close_to_socket' [-Werror=nested-externs] Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Reviewed-by: Daniel P. Berrangé Message-Id: <20230322135721.61138-2-philmd@linaro.org> Signed-off-by: Thomas Huth --- .gitlab-ci.d/windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 87235e43b4..472bacd2e2 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -59,6 +59,7 @@ msys2-64bit: 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 " - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory @@ -108,6 +109,7 @@ msys2-32bit: 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 = 'yes' # Preserve the current working directory