From patchwork Thu Jan 7 10:19:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 12003489 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22861C433E0 for ; Thu, 7 Jan 2021 10:23:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BDD7C2312A for ; Thu, 7 Jan 2021 10:23:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BDD7C2312A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxSRj-0003vI-R7 for qemu-devel@archiver.kernel.org; Thu, 07 Jan 2021 05:23:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxSOJ-00084V-TQ for qemu-devel@nongnu.org; Thu, 07 Jan 2021 05:19:40 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:36270) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kxSOH-00051b-LI for qemu-devel@nongnu.org; Thu, 07 Jan 2021 05:19:39 -0500 Received: by mail-pl1-x62f.google.com with SMTP id j1so3259293pld.3 for ; Thu, 07 Jan 2021 02:19:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q2yKQ77BbmTMA8vu+yHDdY/E8M3VxJJBikSmj73bAUs=; b=QHHLPhfvmxXm6LvIZgSXhsXAfvWG973GSLpSs20jt34043HB0yNtjDw3y1sDZgr1rO Ahm8vqGMrI3VM7nzvX1zNtIT8nGnY5ifAbNwkjejqZd9Rf/MHiix5wBZNFJ52CBtNhPa dNJEOAD0dqaYUtnf+rjWrcbLzkp4Dt3YccI6QzB+HVacH5LhOOFpEl3kKYMPkZDP1OV+ e/EQPkwlOqBl5ngfIY4TKWgabZW+ftnQrBTcA+pBDhXd+bvaCUo7DNU0QnicTGoyX++p uGii4cUc691A2HIwiw+YSPut6N/rNn17eUQMCG0YVOEbhKzqlnyiMVxdJww/Xgur9mox HXoQ== 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=Q2yKQ77BbmTMA8vu+yHDdY/E8M3VxJJBikSmj73bAUs=; b=joBQHuVlRNRQP7PtYNkcA7mSSDZR1ZbAfNxKKT5CrwBpAVK+OMBhPB64Kgm8cH5XEf 4YLdtYjf/cMec0JcOpfofJwXqRRZ9UTA4smxNmFKXC0p8oNPbSZ+mpwfnzh5iGsTJ1ha VKDjXkqlwvJ3Kfq04UUoRBSXMdN0FfwgEGY4Lr6ou9j8AS6DcGxhXYjI72GV13ogD76u 6Nc4OgyMLXWXCaFZ5Da8XrkigUl2RI5JEJdWQqJaF6UYVcvXesutCgmpiXOTmpeSEVce gH4CqZ2WPyiYoe0c2e9TRXFI5Lu84ubhpK3L9wXEy4Ctd4bfw23kx5DEGTIj4/etcMad awrw== X-Gm-Message-State: AOAM532lJnNtVHfgtYADhpMMwCa+BGBj1T6qC2paES6+psSg1FNQsfYh K+2FXCnfOwsojmQipAfgkvFB37iC1CHOwhV2 X-Google-Smtp-Source: ABdhPJz+HghgpdmSysuijAS4D9dcu+vD5xhn7Wt6Ruf5ltcNzZ6nWfguakLTHXZlEWb2U+9ce3GJVw== X-Received: by 2002:a17:902:6a87:b029:da:e253:dd6a with SMTP id n7-20020a1709026a87b02900dae253dd6amr8445322plk.81.1610014775826; Thu, 07 Jan 2021 02:19:35 -0800 (PST) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id s5sm4934662pju.9.2021.01.07.02.19.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 02:19:35 -0800 (PST) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v4 1/5] cirrus/msys2: Exit powershell with $LastExitCode Date: Thu, 7 Jan 2021 02:19:15 -0800 Message-Id: <20210107101919.80-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.29.2.windows.3 In-Reply-To: <20210107101919.80-1-luoyonggang@gmail.com> References: <20210107101919.80-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=luoyonggang@gmail.com; helo=mail-pl1-x62f.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Sunil Muthuswamy , Ed Maste , Yonggang Luo Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Currently if we don't exit with $LastExitCode manually, the cirrus would not report the build/testing failure. Signed-off-by: Yonggang Luo Reviewed-by: Philippe Mathieu-Daudé --- .cirrus.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 3907e036da..68b8a8fa9c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -137,5 +137,7 @@ windows_msys2_task: - C:\tools\msys64\usr\bin\bash.exe -lc "mkdir build" - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure --python=python3" - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make -j8" + - exit $LastExitCode test_script: - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make V=1 check" + - exit $LastExitCode From patchwork Thu Jan 7 10:19:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 12003487 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C1B8C433E6 for ; Thu, 7 Jan 2021 10:21:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2BE842313B for ; Thu, 7 Jan 2021 10:21:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2BE842313B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxSQR-0001Qa-Mr for qemu-devel@archiver.kernel.org; Thu, 07 Jan 2021 05:21:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxSOW-00086E-NQ for qemu-devel@nongnu.org; Thu, 07 Jan 2021 05:19:52 -0500 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]:40137) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kxSOK-00052c-BZ for qemu-devel@nongnu.org; Thu, 07 Jan 2021 05:19:48 -0500 Received: by mail-pl1-x633.google.com with SMTP id q4so3248268plr.7 for ; Thu, 07 Jan 2021 02:19:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h231b8tLTi0WVz8zrZQ87p8PdEzOjSGm/ceVy+4Rnto=; b=b2Iq+8svi7Hu5CDNiYCGCtbyA9L7iyNWQ4BN/Hb9sBoVy89D7qwZG2r3MJkSnzjq67 km/sGpUNb6NZL0MOYF5qVM0hezeLR4MSvspf0uECZVAkO4k/1oN73Nnlok9K/gtJefx1 uedPnhOXAz44XQdbCwfU7m0WZxUpk0WWWeSCy0d4+gysQq3fIf+0VJU/VTQ7Qp4c43Fl G1cFW0DWIYztwAAJmOiJhAuRBsscDDfn3PbA0nVaOpJI3ax7RIgXpaLV6EIzogRQAZl2 4u0E4djiE+OAziFxawxEN3HwPukJC8pkM9UutvsO7YtV8iLCdvAzmapGqLeyec/nOkL1 iFAg== 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=h231b8tLTi0WVz8zrZQ87p8PdEzOjSGm/ceVy+4Rnto=; b=HlIUp06o84iWd+9GVMcM2KXq4wL1FsSLc8FG+A8rYPLHHkv30KEgXmB9K6PqKk63Vh 8XCs2wKlyFynUbzuVDVT2ZD0e+pPC2GK6WPKl315ZN61YViUVdzqlDRI7U17veDD7SOK 6PqSvACZup0UHXlvxNDD58Wi17ni1XORB3HVQtTB9Xy+5wnZZRp2bWy3/F6rmN9q1FU2 5FBTVFc/G7NuorPlesT4Jent5tzvXlNd5dv+6VcB2cHw0nVoOP6Do1LYrpkf8SD0eZFZ ZS1m766ZQUz7t0/z6LVy/t3iMKCR6pDesnAIHgR/5w34CZhYTP37qfpbmbC20fnApHMH AVwA== X-Gm-Message-State: AOAM532kIF7rOBzpX5RuVpBCfsMocIhctWmDDQhFDVMJf6Qs5++zTHcL rUEqFJq5lsgBDsZ9qPZryG55YSMquy7oPXOX X-Google-Smtp-Source: ABdhPJyP5+70xdRVZd7tJHY0Rxh0dV/xh2vZmxoOKxxNCMFo64Su7BwZULsumbUkQVSCji/lrm1tkQ== X-Received: by 2002:a17:902:d202:b029:da:d86b:78be with SMTP id t2-20020a170902d202b02900dad86b78bemr1615678ply.0.1610014778519; Thu, 07 Jan 2021 02:19:38 -0800 (PST) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id s5sm4934662pju.9.2021.01.07.02.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 02:19:37 -0800 (PST) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v4 2/5] cirrus/msys2: Cache msys2 mingw in a better way. Date: Thu, 7 Jan 2021 02:19:16 -0800 Message-Id: <20210107101919.80-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.29.2.windows.3 In-Reply-To: <20210107101919.80-1-luoyonggang@gmail.com> References: <20210107101919.80-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=luoyonggang@gmail.com; helo=mail-pl1-x633.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Sunil Muthuswamy , Ed Maste , Yonggang Luo Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Yonggang Luo --- .cirrus.yml | 117 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 49 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 68b8a8fa9c..bc40a0550d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -64,23 +64,61 @@ windows_msys2_task: CIRRUS_SHELL: powershell MSYS: winsymlinks:nativestrict MSYSTEM: MINGW64 + MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2021-01-05/msys2-base-x86_64-20210105.sfx.exe + MSYS2_FINGERPRINT: 0 + MSYS2_PACKAGES: " + diffutils git grep make pkg-config sed + mingw-w64-x86_64-python + mingw-w64-x86_64-python-sphinx + mingw-w64-x86_64-toolchain + mingw-w64-x86_64-SDL2 + mingw-w64-x86_64-SDL2_image + mingw-w64-x86_64-gtk3 + mingw-w64-x86_64-glib2 + mingw-w64-x86_64-ninja + mingw-w64-x86_64-jemalloc + mingw-w64-x86_64-lzo2 + mingw-w64-x86_64-zstd + mingw-w64-x86_64-libjpeg-turbo + mingw-w64-x86_64-pixman + mingw-w64-x86_64-libgcrypt + mingw-w64-x86_64-libpng + mingw-w64-x86_64-libssh + mingw-w64-x86_64-libxml2 + mingw-w64-x86_64-snappy + mingw-w64-x86_64-libusb + mingw-w64-x86_64-usbredir + mingw-w64-x86_64-libtasn1 + mingw-w64-x86_64-nettle + mingw-w64-x86_64-cyrus-sasl + mingw-w64-x86_64-curl + mingw-w64-x86_64-gnutls + mingw-w64-x86_64-libnfs + " CHERE_INVOKING: 1 - setup_script: - - choco install -y --no-progress 7zip - - Write-Output $env:PATH msys2_cache: folder: C:\tools\archive reupload_on_changes: false - fingerprint_script: cat .cirrus.yml + # These env variables are used to generate fingerprint to trigger the cache procedure + # If wanna to force re-populate msys2, increase MSYS2_FINGERPRINT + fingerprint_script: + - | + echo $env:CIRRUS_TASK_NAME + echo $env:MSYS2_URL + echo $env:MSYS2_FINGERPRINT + echo $env:MSYS2_PACKAGES populate_script: - | - md C:\tools - md C:\tools\archive + md -Force C:\tools\archive\pkg $start_time = Get-Date + bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND $env:MSYS2_URL C:\tools\archive\base.exe + Write-Output "Download time taken: $((Get-Date).Subtract($start_time))" cd C:\tools - bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND https://github.com/msys2/msys2-installer/releases/download/2020-09-03/msys2-base-x86_64-20200903.sfx.exe C:\tools\base.exe - Write-Output "Download time taken: $((Get-Date).Subtract($start_time).Seconds) second(s)" - C:\tools\base.exe -y + C:\tools\archive\base.exe -y + del -Force C:\tools\archive\base.exe + Write-Output "Base install time taken: $((Get-Date).Subtract($start_time))" + $start_time = Get-Date + ((Get-Content -path C:\tools\msys64\etc\\post-install\\07-pacman-key.post -Raw) -replace '--refresh-keys', '--version') | Set-Content -Path C:\tools\msys64\etc\\post-install\\07-pacman-key.post C:\tools\msys64\usr\bin\bash.exe -lc "sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf" C:\tools\msys64\usr\bin\bash.exe -lc "export" @@ -90,49 +128,30 @@ windows_msys2_task: tasklist C:\tools\msys64\usr\bin\bash.exe -lc "mv -f /etc/pacman.conf.pacnew /etc/pacman.conf || true" C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Suu --overwrite=*" - C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed \ - diffutils git grep make pkg-config sed \ - mingw-w64-x86_64-python \ - mingw-w64-x86_64-toolchain \ - mingw-w64-x86_64-SDL2 \ - mingw-w64-x86_64-SDL2_image \ - mingw-w64-x86_64-gtk3 \ - mingw-w64-x86_64-glib2 \ - mingw-w64-x86_64-ninja \ - mingw-w64-x86_64-jemalloc \ - mingw-w64-x86_64-lzo2 \ - mingw-w64-x86_64-zstd \ - mingw-w64-x86_64-libjpeg-turbo \ - mingw-w64-x86_64-pixman \ - mingw-w64-x86_64-libgcrypt \ - mingw-w64-x86_64-libpng \ - mingw-w64-x86_64-libssh \ - mingw-w64-x86_64-libxml2 \ - mingw-w64-x86_64-snappy \ - mingw-w64-x86_64-libusb \ - mingw-w64-x86_64-usbredir \ - mingw-w64-x86_64-libtasn1 \ - mingw-w64-x86_64-nettle \ - mingw-w64-x86_64-cyrus-sasl \ - mingw-w64-x86_64-curl \ - mingw-w64-x86_64-gnutls \ - mingw-w64-x86_64-libnfs \ - " - bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND ` - https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz ` - C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz - C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -U /c/tools/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz" - del C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz - C:\tools\msys64\usr\bin\bash.exe -lc "rm -rf /var/cache/pacman/pkg/*" - cd C:\tools\msys64 - echo "Start archive" - cmd /C "7z a -ttar . -so | 7z a -txz -simsys2-x86_64.tar C:\tools\archive\msys2-x86_64.tar.xz" + Write-Output "Core install time taken: $((Get-Date).Subtract($start_time))" + $start_time = Get-Date + + C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed $env:MSYS2_PACKAGES" + Write-Output "Package install time taken: $((Get-Date).Subtract($start_time))" + $start_time = Get-Date + + del -Force -ErrorAction SilentlyContinue C:\tools\msys64\etc\mtab + del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\fd + del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stderr + del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stdin + del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stdout + del -Force -Recurse -ErrorAction SilentlyContinue C:\tools\msys64\var\cache\pacman\pkg + tar cf C:\tools\archive\msys64.tar -C C:\tools\ msys64 + + Write-Output "Package archive time taken: $((Get-Date).Subtract($start_time))" + del -Force -Recurse -ErrorAction SilentlyContinue c:\tools\msys64 install_script: - | + $start_time = Get-Date cd C:\tools - cmd /C "7z x C:\tools\archive\msys2-x86_64.tar.xz -so | 7z x -aoa -simsys2-x86_64.tar -ttar -omsys64" - C:\tools\msys64\usr\bin\bash.exe -lc "export" - + ls C:\tools\archive\msys64.tar + tar xf C:\tools\archive\msys64.tar + Write-Output "Extract msys2 time taken: $((Get-Date).Subtract($start_time))" script: - C:\tools\msys64\usr\bin\bash.exe -lc "mkdir build" - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure --python=python3" From patchwork Thu Jan 7 10:19:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 12003485 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D1ECC433DB for ; Thu, 7 Jan 2021 10:21:53 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BCA842313B for ; Thu, 7 Jan 2021 10:21:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BCA842313B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxSQR-0001RA-KE for qemu-devel@archiver.kernel.org; Thu, 07 Jan 2021 05:21:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxSOd-00086x-Np for qemu-devel@nongnu.org; Thu, 07 Jan 2021 05:20:00 -0500 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]:55156) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kxSOM-00053L-PW for qemu-devel@nongnu.org; Thu, 07 Jan 2021 05:19:55 -0500 Received: by mail-pj1-x102b.google.com with SMTP id f14so1179961pju.4 for ; Thu, 07 Jan 2021 02:19:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FJcCqNbly+HuBFBx/VMoWDYh1LrAqFMypQIcCUsLO3E=; b=gqmPomGazmjZR/ZQSS60Ma8yPzAHWhGuR03yEsOmkg1NeuWHox1i37IvC7ivEGp2QD uW9QEYc4z/zei6A9JE6aAThEIsHiiAYcfyPDjaSiel1+I2djK7t7KORtDo/1e9NnZdQd KlkEkAU6DwH8hFz/GDd16ViS4JWgLmQ/z9OzEquF4dFtHHA45OJCcUMCsz9tv0yU+mqB kO5WluYTnzgpEGqncxe5dhC40swHygOUs0QDpqb8SOb30MLe4um2VG7WBbgTr7l9wSj7 06tB7j2hlKJma0ru7UuxYl45DNaUMAj7l19Ch6mRxlDuntUSESrHUC5ojAyuWws/LiH6 9J6Q== 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=FJcCqNbly+HuBFBx/VMoWDYh1LrAqFMypQIcCUsLO3E=; b=Vgs2bN3xnRhh/wP8FbnySyZWPmMsO7vf3/nZOdoX0YM5iB6bkApzecaNSyvUfvfuUf PvDCQd2zZzxI8eKjURM7HrO0l/iSP7Ic5DzcibX2uIa8JY5f5e0AQ8ETw0BPLHSFlTWy ezY3er/zLhm4VWQ7WadpbHv07uzE+DnOKA1thNjSAsPLi+XAz1PwAeCtHXEmo3msjHaK UKsxpYWx+eOSmivv4svgEoaMjl1QhsfhTZ0NOvm9508XSiSI6j3D16W6U/rr7ePYEVVa CP6EGgg37j7XKIeoSy6pg/+/E+ZCJQpWYtHEv1E9eyQxlR3GwRt4n3R5vMKP1a5Og/4h 5MRw== X-Gm-Message-State: AOAM531B5ABapUhM+W18ZeNUaCl3r1RVFzLcItsQSswrc0EQgsHju63P /iSCBcZW0a2D0e/nxx5S6QxlJ1yR7Gn90dW/ X-Google-Smtp-Source: ABdhPJxwoqpUrLbF20CmKv8ukYcng1WKVZG2pw/Hh1kB+7JvRq7o0NPSO1M8NalgwKm/3mQY3DY+Qg== X-Received: by 2002:a17:90b:4394:: with SMTP id in20mr8804400pjb.34.1610014781122; Thu, 07 Jan 2021 02:19:41 -0800 (PST) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id s5sm4934662pju.9.2021.01.07.02.19.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 02:19:40 -0800 (PST) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v4 3/5] maintainers: Add me as Windows Hosted Continuous Integration maintainer Date: Thu, 7 Jan 2021 02:19:17 -0800 Message-Id: <20210107101919.80-4-luoyonggang@gmail.com> X-Mailer: git-send-email 2.29.2.windows.3 In-Reply-To: <20210107101919.80-1-luoyonggang@gmail.com> References: <20210107101919.80-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=luoyonggang@gmail.com; helo=mail-pj1-x102b.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Sunil Muthuswamy , Ed Maste , Yonggang Luo Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Yonggang Luo Reviewed-by: Philippe Mathieu-Daudé --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 4be087b88e..4d9df874a1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3198,6 +3198,12 @@ S: Maintained F: .cirrus.yml W: https://cirrus-ci.com/github/qemu/qemu +Windows Hosted Continuous Integration +M: Yonggang Luo +S: Maintained +F: .cirrus.yml +W: https://cirrus-ci.com/github/qemu/qemu + GitLab Continuous Integration M: Thomas Huth M: Philippe Mathieu-Daudé From patchwork Thu Jan 7 10:19:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 12003491 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B629EC433DB for ; Thu, 7 Jan 2021 10:23:40 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 41EA92312A for ; Thu, 7 Jan 2021 10:23:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 41EA92312A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxSSB-0004DI-A6 for qemu-devel@archiver.kernel.org; Thu, 07 Jan 2021 05:23:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxSOW-00086G-WB for qemu-devel@nongnu.org; Thu, 07 Jan 2021 05:19:55 -0500 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]:43800) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kxSOP-00054a-Tf for qemu-devel@nongnu.org; Thu, 07 Jan 2021 05:19:52 -0500 Received: by mail-pf1-x433.google.com with SMTP id c12so3569198pfo.10 for ; Thu, 07 Jan 2021 02:19:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dSi1f/7draldcvhbTcR9eZXnx6tBY5L1isM3ly1Kkz0=; b=sq3OhRk1G3iqYbJ0dy2FVZXox6yIFRHNY62j057jb6+/jqKNQpBJwn2y90Cn23rHEw /RjrjMSiAYis7nB9S/6sK9YI/5BTEtfyhHE51bmt407Ie4cn3AAd1rnQK2WsuCvQgxuc xwVQiIE9WExrDy8bSCa6O+owhhDByCAKojrl3En69ULwcvjM/IDJt/AoqVV10L4mIfCu DFNIJkloDKU24hIzZp66aaR2BDxAXhecPJ5PfiyC4edETkG14ktBv592S0pFMC/gQu6d 379L0B3I1xnteya+SpkU7Rr46lRNa1s5WrLjqnJGi4O8BY6PjVwyuAL0T8/6z41rrrKg QrDg== 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=dSi1f/7draldcvhbTcR9eZXnx6tBY5L1isM3ly1Kkz0=; b=f7UmKSZpYRbN3CV2G6nH3skCBfCoTdmBQ6kC4UPOAZKutyPrEEXYUjuQ7LNAZXvT1r yihJS18Es8XvjpYzX5sOPn2Qc87b3amSaWs9yrjnZ04UadjwP0mx3k3r5rtfdaE78hAE yUao9uAIS7b0cKmdnT7RlopJjxNXz4CS3y5epC6D7zyW13V6iCZlrzpkkSUziOvzscul fB2SJerTMETOjAChjFYIWk18ucPcrauJTZZIx4+DgcZowE9y+d0vxHAW9RLmsY8UznC/ OHP+yk0F2ozSw2MRAevf5f7HC323P4ncEP1ghEr6GyCTItZd1aD3uMfSWoTlCOFPe/Gv rtvw== X-Gm-Message-State: AOAM530vOUWzeEQeXWp75xuFl8Lejc8MX/QbROWkkPGGBJUG6RhQBKQV /SX2KoMlaD0vyBx0EgHTzR1kt45aXdNmlzjv X-Google-Smtp-Source: ABdhPJzzsXkFZ9L93rSeN/duFxWElwV0lXqmXt1IA0tCzQ/SQqlRh0MIRs7xmnjdiwTzuFw620/3tA== X-Received: by 2002:a63:d24d:: with SMTP id t13mr1170249pgi.37.1610014783818; Thu, 07 Jan 2021 02:19:43 -0800 (PST) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id s5sm4934662pju.9.2021.01.07.02.19.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 02:19:43 -0800 (PST) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v4 4/5] whpx: Fixes include of whp-dispatch.h in whpx.h Date: Thu, 7 Jan 2021 02:19:18 -0800 Message-Id: <20210107101919.80-5-luoyonggang@gmail.com> X-Mailer: git-send-email 2.29.2.windows.3 In-Reply-To: <20210107101919.80-1-luoyonggang@gmail.com> References: <20210107101919.80-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x433.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Sunil Muthuswamy , Ed Maste , Yonggang Luo Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Yonggang Luo Reviewed-by: Philippe Mathieu-Daudé --- include/sysemu/whpx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sysemu/whpx.h b/include/sysemu/whpx.h index 9346fd92e9..4f38784d7e 100644 --- a/include/sysemu/whpx.h +++ b/include/sysemu/whpx.h @@ -15,7 +15,7 @@ #ifdef CONFIG_WHPX -#include "whp-dispatch.h" +#include struct whpx_state { uint64_t mem_quota; From patchwork Thu Jan 7 10:19:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 12003493 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D70F3C433E0 for ; Thu, 7 Jan 2021 10:26:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6278123333 for ; Thu, 7 Jan 2021 10:26:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6278123333 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxSUx-0007mg-Cc for qemu-devel@archiver.kernel.org; Thu, 07 Jan 2021 05:26:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxSOe-00087N-Ra for qemu-devel@nongnu.org; Thu, 07 Jan 2021 05:20:00 -0500 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]:38878) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kxSOS-00054j-OY for qemu-devel@nongnu.org; Thu, 07 Jan 2021 05:19:58 -0500 Received: by mail-pg1-x52e.google.com with SMTP id q7so2624089pgm.5 for ; Thu, 07 Jan 2021 02:19:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f4d6+/fiHcHh6WBlQoqouCJtUMFkdB+MaBZ1d0g9sEA=; b=rXbBs65ClOcsCBxasIZ4uqJ8d+AlrpUc5xKnW4pDh/do7QsPRQNcfMVITX0mJEskk3 16OqaLXZLS7bpFQFFrdQhI9MU+lgZLhKltqHygI6rzjkZ5prHMFHxAfvxw7/d3I726sl cwqZga6lZXy1LNfCEvVtSRaK8vecvQr9SwVWzjpvAqidGXH4PzfWrwqpHmWHxeZaaGVz TEzotjjsn2gV3+pNx+zM2+Ut1KJ3izEhh+xq1T5gZnKF4zSNgANsGKBSE196DmszFiQF 9gIcD+nD2B71L8/praYLSASBvOUWS3j39DXuI3MOeLAZmbZHmw32gHixQoPGnqTIMmRc aWzA== 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=f4d6+/fiHcHh6WBlQoqouCJtUMFkdB+MaBZ1d0g9sEA=; b=KzfoWRvmR0rh0dJjfLLycT7tABwZQBuCwMosNMdRlFcfVGw1ZSMCadPVbKrMuEZOQc jRjsfyOauB4SVMl/HXgrHRfOafrHZWcjj1HB0I/AubudqIQabkncVnKjDmSehCLGrvGF /reywGz2W4XCN9Vgy+oqGQ4Xr7jXZ10/tTn0xxeUr6grKqlKjgXXIKEUzd0+17typAS4 b5l4mbPUwOefdSMygwtLYfq0WKMDe+Lukd0FrGDcBSh1kZ4KWy5T8TwBQ8Ea+qwNSraR V5UY6wUVS/UOYcCJZY5csqA5i7m3wZT9bDfGHelukD98OGEJFEk36hTAYdKqPmtlouSn FJMg== X-Gm-Message-State: AOAM530nHU6AfPqV6c2r8vFevatFc3d/y9Wd1OGDRNTziyzPG/WsBSpR xwcyW4vrMR/IuvmcxDfzxJ5VK31Owpu4jknT X-Google-Smtp-Source: ABdhPJxD0kVQbzDANMRkzVx0GC8RZEEMHUVhU2RTa31j1Xvsnlm7fkpGPIFBJpnrQuaxC9yz1yxZYA== X-Received: by 2002:a63:4b5c:: with SMTP id k28mr1164924pgl.294.1610014786515; Thu, 07 Jan 2021 02:19:46 -0800 (PST) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id s5sm4934662pju.9.2021.01.07.02.19.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 02:19:45 -0800 (PST) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v4 5/5] whpx: move whpx_lapic_state from header to c file Date: Thu, 7 Jan 2021 02:19:19 -0800 Message-Id: <20210107101919.80-6-luoyonggang@gmail.com> X-Mailer: git-send-email 2.29.2.windows.3 In-Reply-To: <20210107101919.80-1-luoyonggang@gmail.com> References: <20210107101919.80-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x52e.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Sunil Muthuswamy , Ed Maste , Yonggang Luo Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This struct only used in whpx-apic.c, there is no need expose it in whpx.h. Signed-off-by: Yonggang Luo --- include/sysemu/whpx.h | 7 ------- target/i386/whpx/whpx-apic.c | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/sysemu/whpx.h b/include/sysemu/whpx.h index 4f38784d7e..bfbcaa25d8 100644 --- a/include/sysemu/whpx.h +++ b/include/sysemu/whpx.h @@ -25,13 +25,6 @@ struct whpx_state { bool apic_in_platform; }; -struct whpx_lapic_state { - struct { - uint32_t data; - uint32_t padding[3]; - } fields[256]; -}; - extern struct whpx_state whpx_global; int whpx_enabled(void); diff --git a/target/i386/whpx/whpx-apic.c b/target/i386/whpx/whpx-apic.c index b127a3cb8a..dd60fb0996 100644 --- a/target/i386/whpx/whpx-apic.c +++ b/target/i386/whpx/whpx-apic.c @@ -20,6 +20,13 @@ #include "sysemu/whpx.h" #include "whp-dispatch.h" +struct whpx_lapic_state { + struct { + uint32_t data; + uint32_t padding[3]; + } fields[256]; +}; + static void whpx_put_apic_state(APICCommonState *s, struct whpx_lapic_state *kapic) {