All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes
@ 2021-01-07 10:19 Yonggang Luo
  2021-01-07 10:19 ` [PATCH v4 1/5] cirrus/msys2: Exit powershell with $LastExitCode Yonggang Luo
                   ` (7 more replies)
  0 siblings, 8 replies; 16+ messages in thread
From: Yonggang Luo @ 2021-01-07 10:19 UTC (permalink / raw)
  To: qemu-devel; +Cc: Paolo Bonzini, Sunil Muthuswamy, Ed Maste, Yonggang Luo

V1-V2
Fixes whpx: Fixes include of whp-dispatch.h in whpx.h by
  the suggestion of Philippe Mathieu-Daudé <philmd@redhat.com>
Add new patch whpx: move whpx_lapic_state from header to c file

The test-vmstate can be passed under win32 too
so enable it on win32,
This is based on Bonzini's upstream tag along

Yonggang Luo (5):
  cirrus/msys2: Exit powershell with $LastExitCode
  cirrus/msys2: Cache msys2 mingw in a better way.
  maintainers: Add me as Windows Hosted Continuous Integration
    maintainer
  whpx: Fixes include of whp-dispatch.h in whpx.h
  whpx: move whpx_lapic_state from header to c file

 .cirrus.yml                  | 119 ++++++++++++++++++++---------------
 MAINTAINERS                  |   6 ++
 include/sysemu/whpx.h        |   9 +--
 target/i386/whpx/whpx-apic.c |   7 +++
 4 files changed, 84 insertions(+), 57 deletions(-)

-- 
2.29.2.windows.3



^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v4 1/5] cirrus/msys2: Exit powershell with $LastExitCode
  2021-01-07 10:19 [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes Yonggang Luo
@ 2021-01-07 10:19 ` Yonggang Luo
  2021-01-07 11:16   ` Philippe Mathieu-Daudé
  2021-01-07 10:19 ` [PATCH v4 2/5] cirrus/msys2: Cache msys2 mingw in a better way Yonggang Luo
                   ` (6 subsequent siblings)
  7 siblings, 1 reply; 16+ messages in thread
From: Yonggang Luo @ 2021-01-07 10:19 UTC (permalink / raw)
  To: qemu-devel; +Cc: Paolo Bonzini, Sunil Muthuswamy, Ed Maste, Yonggang Luo

Currently if we don't exit with $LastExitCode manually,
the cirrus would not report the build/testing failure.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 .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
-- 
2.29.2.windows.3



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH v4 2/5] cirrus/msys2: Cache msys2 mingw in a better way.
  2021-01-07 10:19 [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes Yonggang Luo
  2021-01-07 10:19 ` [PATCH v4 1/5] cirrus/msys2: Exit powershell with $LastExitCode Yonggang Luo
@ 2021-01-07 10:19 ` Yonggang Luo
  2021-01-07 10:19 ` [PATCH v4 3/5] maintainers: Add me as Windows Hosted Continuous Integration maintainer Yonggang Luo
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 16+ messages in thread
From: Yonggang Luo @ 2021-01-07 10:19 UTC (permalink / raw)
  To: qemu-devel; +Cc: Paolo Bonzini, Sunil Muthuswamy, Ed Maste, Yonggang Luo

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 .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"
-- 
2.29.2.windows.3



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH v4 3/5] maintainers: Add me as Windows Hosted Continuous Integration maintainer
  2021-01-07 10:19 [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes Yonggang Luo
  2021-01-07 10:19 ` [PATCH v4 1/5] cirrus/msys2: Exit powershell with $LastExitCode Yonggang Luo
  2021-01-07 10:19 ` [PATCH v4 2/5] cirrus/msys2: Cache msys2 mingw in a better way Yonggang Luo
@ 2021-01-07 10:19 ` Yonggang Luo
  2021-01-07 11:17   ` Philippe Mathieu-Daudé
  2021-01-07 10:19 ` [PATCH v4 4/5] whpx: Fixes include of whp-dispatch.h in whpx.h Yonggang Luo
                   ` (4 subsequent siblings)
  7 siblings, 1 reply; 16+ messages in thread
From: Yonggang Luo @ 2021-01-07 10:19 UTC (permalink / raw)
  To: qemu-devel; +Cc: Paolo Bonzini, Sunil Muthuswamy, Ed Maste, Yonggang Luo

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 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 <luoyonggang@gmail.com>
+S: Maintained
+F: .cirrus.yml
+W: https://cirrus-ci.com/github/qemu/qemu
+
 GitLab Continuous Integration
 M: Thomas Huth <thuth@redhat.com>
 M: Philippe Mathieu-Daudé <philmd@redhat.com>
-- 
2.29.2.windows.3



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH v4 4/5] whpx: Fixes include of whp-dispatch.h in whpx.h
  2021-01-07 10:19 [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes Yonggang Luo
                   ` (2 preceding siblings ...)
  2021-01-07 10:19 ` [PATCH v4 3/5] maintainers: Add me as Windows Hosted Continuous Integration maintainer Yonggang Luo
@ 2021-01-07 10:19 ` Yonggang Luo
  2021-01-07 10:26   ` Marc-André Lureau
  2021-01-07 11:17   ` Philippe Mathieu-Daudé
  2021-01-07 10:19 ` [PATCH v4 5/5] whpx: move whpx_lapic_state from header to c file Yonggang Luo
                   ` (3 subsequent siblings)
  7 siblings, 2 replies; 16+ messages in thread
From: Yonggang Luo @ 2021-01-07 10:19 UTC (permalink / raw)
  To: qemu-devel; +Cc: Paolo Bonzini, Sunil Muthuswamy, Ed Maste, Yonggang Luo

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 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 <WinHvPlatformDefs.h>
 
 struct whpx_state {
     uint64_t mem_quota;
-- 
2.29.2.windows.3



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH v4 5/5] whpx: move whpx_lapic_state from header to c file
  2021-01-07 10:19 [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes Yonggang Luo
                   ` (3 preceding siblings ...)
  2021-01-07 10:19 ` [PATCH v4 4/5] whpx: Fixes include of whp-dispatch.h in whpx.h Yonggang Luo
@ 2021-01-07 10:19 ` Yonggang Luo
  2021-01-07 10:28   ` Marc-André Lureau
  2021-01-07 10:28 ` [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes Paolo Bonzini
                   ` (2 subsequent siblings)
  7 siblings, 1 reply; 16+ messages in thread
From: Yonggang Luo @ 2021-01-07 10:19 UTC (permalink / raw)
  To: qemu-devel; +Cc: Paolo Bonzini, Sunil Muthuswamy, Ed Maste, Yonggang Luo

This struct only used in whpx-apic.c, there is no need
expose it in whpx.h.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 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)
 {
-- 
2.29.2.windows.3



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [PATCH v4 4/5] whpx: Fixes include of whp-dispatch.h in whpx.h
  2021-01-07 10:19 ` [PATCH v4 4/5] whpx: Fixes include of whp-dispatch.h in whpx.h Yonggang Luo
@ 2021-01-07 10:26   ` Marc-André Lureau
  2021-01-07 11:17   ` Philippe Mathieu-Daudé
  1 sibling, 0 replies; 16+ messages in thread
From: Marc-André Lureau @ 2021-01-07 10:26 UTC (permalink / raw)
  To: Yonggang Luo; +Cc: Paolo Bonzini, Sunil Muthuswamy, Ed Maste, QEMU

[-- Attachment #1: Type: text/plain, Size: 787 bytes --]

Hi

On Thu, Jan 7, 2021 at 2:23 PM Yonggang Luo <luoyonggang@gmail.com> wrote:

> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
>  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 <WinHvPlatformDefs.h>
>
>  struct whpx_state {
>      uint64_t mem_quota;
> --
> 2.29.2.windows.3
>

I submitted a similar patch, then Paolo did a different approach which
didn't land yet:
https://patchew.org/QEMU/20201219090637.1700900-1-pbonzini@redhat.com/


-- 
Marc-André Lureau

[-- Attachment #2: Type: text/html, Size: 1402 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes
  2021-01-07 10:19 [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes Yonggang Luo
                   ` (4 preceding siblings ...)
  2021-01-07 10:19 ` [PATCH v4 5/5] whpx: move whpx_lapic_state from header to c file Yonggang Luo
@ 2021-01-07 10:28 ` Paolo Bonzini
  2021-01-07 10:30 ` no-reply
  2021-01-07 11:35 ` Paolo Bonzini
  7 siblings, 0 replies; 16+ messages in thread
From: Paolo Bonzini @ 2021-01-07 10:28 UTC (permalink / raw)
  To: Yonggang Luo, qemu-devel; +Cc: Sunil Muthuswamy, Ed Maste

On 07/01/21 11:19, Yonggang Luo wrote:
> V1-V2
> Fixes whpx: Fixes include of whp-dispatch.h in whpx.h by
>    the suggestion of Philippe Mathieu-Daudé <philmd@redhat.com>
> Add new patch whpx: move whpx_lapic_state from header to c file
> 
> The test-vmstate can be passed under win32 too
> so enable it on win32,
> This is based on Bonzini's upstream tag along
> 
> Yonggang Luo (5):
>    cirrus/msys2: Exit powershell with $LastExitCode
>    cirrus/msys2: Cache msys2 mingw in a better way.
>    maintainers: Add me as Windows Hosted Continuous Integration
>      maintainer
>    whpx: Fixes include of whp-dispatch.h in whpx.h
>    whpx: move whpx_lapic_state from header to c file
> 
>   .cirrus.yml                  | 119 ++++++++++++++++++++---------------
>   MAINTAINERS                  |   6 ++
>   include/sysemu/whpx.h        |   9 +--
>   target/i386/whpx/whpx-apic.c |   7 +++
>   4 files changed, 84 insertions(+), 57 deletions(-)
> 

Instead of your patch 4, can you look at 
https://patchew.org/QEMU/20201219090637.1700900-1-pbonzini@redhat.com/ 
instead?

Paolo



^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v4 5/5] whpx: move whpx_lapic_state from header to c file
  2021-01-07 10:19 ` [PATCH v4 5/5] whpx: move whpx_lapic_state from header to c file Yonggang Luo
@ 2021-01-07 10:28   ` Marc-André Lureau
  2021-01-07 10:55     ` Paolo Bonzini
  0 siblings, 1 reply; 16+ messages in thread
From: Marc-André Lureau @ 2021-01-07 10:28 UTC (permalink / raw)
  To: Yonggang Luo; +Cc: Paolo Bonzini, Sunil Muthuswamy, Ed Maste, QEMU

[-- Attachment #1: Type: text/plain, Size: 1593 bytes --]

Hi

On Thu, Jan 7, 2021 at 2:26 PM Yonggang Luo <luoyonggang@gmail.com> wrote:

> This struct only used in whpx-apic.c, there is no need
> expose it in whpx.h.
>
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
>

Similar patch pending:
https://patchew.org/QEMU/20201219090637.1700900-1-pbonzini@redhat.com/20201219090637.1700900-3-pbonzini@redhat.com/

---
>  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)
>  {
> --
> 2.29.2.windows.3
>
>
>

-- 
Marc-André Lureau

[-- Attachment #2: Type: text/html, Size: 2510 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes
  2021-01-07 10:19 [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes Yonggang Luo
                   ` (5 preceding siblings ...)
  2021-01-07 10:28 ` [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes Paolo Bonzini
@ 2021-01-07 10:30 ` no-reply
  2021-01-07 11:35 ` Paolo Bonzini
  7 siblings, 0 replies; 16+ messages in thread
From: no-reply @ 2021-01-07 10:30 UTC (permalink / raw)
  To: luoyonggang; +Cc: pbonzini, sunilmut, emaste, qemu-devel, luoyonggang

Patchew URL: https://patchew.org/QEMU/20210107101919.80-1-luoyonggang@gmail.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Type: series
Message-id: 20210107101919.80-1-luoyonggang@gmail.com
Subject: [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 - [tag update]      patchew/20210107072933.3828450-1-f4bug@amsat.org -> patchew/20210107072933.3828450-1-f4bug@amsat.org
 * [new tag]         patchew/20210107101919.80-1-luoyonggang@gmail.com -> patchew/20210107101919.80-1-luoyonggang@gmail.com
Switched to a new branch 'test'
d93d83c whpx: move whpx_lapic_state from header to c file
538f307 whpx: Fixes include of whp-dispatch.h in whpx.h
067501d maintainers: Add me as Windows Hosted Continuous Integration maintainer
f41409d cirrus/msys2: Cache msys2 mingw in a better way.
99acb3d cirrus/msys2: Exit powershell with $LastExitCode

=== OUTPUT BEGIN ===
1/5 Checking commit 99acb3d7c333 (cirrus/msys2: Exit powershell with $LastExitCode)
2/5 Checking commit f41409d6d5f1 (cirrus/msys2: Cache msys2 mingw in a better way.)
ERROR: trailing whitespace
#142: FILE: .cirrus.yml:141:
+        del -Force -Recurse -ErrorAction SilentlyContinue c:\tools\msys64 $

total: 1 errors, 0 warnings, 140 lines checked

Patch 2/5 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

3/5 Checking commit 067501d7586d (maintainers: Add me as Windows Hosted Continuous Integration maintainer)
4/5 Checking commit 538f3072fc14 (whpx: Fixes include of whp-dispatch.h in whpx.h)
5/5 Checking commit d93d83c9f8db (whpx: move whpx_lapic_state from header to c file)
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20210107101919.80-1-luoyonggang@gmail.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v4 5/5] whpx: move whpx_lapic_state from header to c file
  2021-01-07 10:28   ` Marc-André Lureau
@ 2021-01-07 10:55     ` Paolo Bonzini
  2021-01-07 10:57       ` 罗勇刚(Yonggang Luo)
  0 siblings, 1 reply; 16+ messages in thread
From: Paolo Bonzini @ 2021-01-07 10:55 UTC (permalink / raw)
  To: Marc-André Lureau, Yonggang Luo; +Cc: Sunil Muthuswamy, Ed Maste, QEMU

On 07/01/21 11:28, Marc-André Lureau wrote:
> Hi
> 
> On Thu, Jan 7, 2021 at 2:26 PM Yonggang Luo <luoyonggang@gmail.com 
> <mailto:luoyonggang@gmail.com>> wrote:
> 
>     This struct only used in whpx-apic.c, there is no need
>     expose it in whpx.h.
> 
>     Signed-off-by: Yonggang Luo <luoyonggang@gmail.com
>     <mailto:luoyonggang@gmail.com>>
> 
> 
> Similar patch pending:
> https://patchew.org/QEMU/20201219090637.1700900-1-pbonzini@redhat.com/20201219090637.1700900-3-pbonzini@redhat.com/ 
> <https://patchew.org/QEMU/20201219090637.1700900-1-pbonzini@redhat.com/20201219090637.1700900-3-pbonzini@redhat.com/>

This one could still be applied before or after mine, it makes sense.

Paolo



^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v4 5/5] whpx: move whpx_lapic_state from header to c file
  2021-01-07 10:55     ` Paolo Bonzini
@ 2021-01-07 10:57       ` 罗勇刚(Yonggang Luo)
  0 siblings, 0 replies; 16+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2021-01-07 10:57 UTC (permalink / raw)
  To: Paolo Bonzini; +Cc: Ed Maste, Sunil Muthuswamy, Marc-André Lureau, QEMU

[-- Attachment #1: Type: text/plain, Size: 963 bytes --]

On Thu, Jan 7, 2021 at 2:55 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> On 07/01/21 11:28, Marc-André Lureau wrote:
> > Hi
> >
> > On Thu, Jan 7, 2021 at 2:26 PM Yonggang Luo <luoyonggang@gmail.com
> > <mailto:luoyonggang@gmail.com>> wrote:
> >
> >     This struct only used in whpx-apic.c, there is no need
> >     expose it in whpx.h.
> >
> >     Signed-off-by: Yonggang Luo <luoyonggang@gmail.com
> >     <mailto:luoyonggang@gmail.com>>
> >
> >
> > Similar patch pending:
> >
https://patchew.org/QEMU/20201219090637.1700900-1-pbonzini@redhat.com/20201219090637.1700900-3-pbonzini@redhat.com/
> > <
https://patchew.org/QEMU/20201219090637.1700900-1-pbonzini@redhat.com/20201219090637.1700900-3-pbonzini@redhat.com/
>
>
> This one could still be applied before or after mine, it makes sense.
>
> Paolo
>
OK, prefer yours:) I am trying to green the CI,

--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo

[-- Attachment #2: Type: text/html, Size: 1686 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v4 1/5] cirrus/msys2: Exit powershell with $LastExitCode
  2021-01-07 10:19 ` [PATCH v4 1/5] cirrus/msys2: Exit powershell with $LastExitCode Yonggang Luo
@ 2021-01-07 11:16   ` Philippe Mathieu-Daudé
  0 siblings, 0 replies; 16+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-07 11:16 UTC (permalink / raw)
  To: Yonggang Luo, qemu-devel; +Cc: Paolo Bonzini, Sunil Muthuswamy, Ed Maste

On 1/7/21 11:19 AM, Yonggang Luo wrote:
> Currently if we don't exit with $LastExitCode manually,
> the cirrus would not report the build/testing failure.
> 
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>

Please keep tag from reviewers when sending new versions.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>  .cirrus.yml | 2 ++
>  1 file changed, 2 insertions(+)



^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v4 3/5] maintainers: Add me as Windows Hosted Continuous Integration maintainer
  2021-01-07 10:19 ` [PATCH v4 3/5] maintainers: Add me as Windows Hosted Continuous Integration maintainer Yonggang Luo
@ 2021-01-07 11:17   ` Philippe Mathieu-Daudé
  0 siblings, 0 replies; 16+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-07 11:17 UTC (permalink / raw)
  To: Yonggang Luo, qemu-devel; +Cc: Paolo Bonzini, Sunil Muthuswamy, Ed Maste

On 1/7/21 11:19 AM, Yonggang Luo wrote:
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
>  MAINTAINERS | 6 ++++++
>  1 file changed, 6 insertions(+)

Again:

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>



^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v4 4/5] whpx: Fixes include of whp-dispatch.h in whpx.h
  2021-01-07 10:19 ` [PATCH v4 4/5] whpx: Fixes include of whp-dispatch.h in whpx.h Yonggang Luo
  2021-01-07 10:26   ` Marc-André Lureau
@ 2021-01-07 11:17   ` Philippe Mathieu-Daudé
  1 sibling, 0 replies; 16+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-07 11:17 UTC (permalink / raw)
  To: Yonggang Luo, qemu-devel; +Cc: Paolo Bonzini, Sunil Muthuswamy, Ed Maste

On 1/7/21 11:19 AM, Yonggang Luo wrote:
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
>  include/sysemu/whpx.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>



^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes
  2021-01-07 10:19 [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes Yonggang Luo
                   ` (6 preceding siblings ...)
  2021-01-07 10:30 ` no-reply
@ 2021-01-07 11:35 ` Paolo Bonzini
  7 siblings, 0 replies; 16+ messages in thread
From: Paolo Bonzini @ 2021-01-07 11:35 UTC (permalink / raw)
  To: Yonggang Luo, qemu-devel; +Cc: Sunil Muthuswamy, Ed Maste

On 07/01/21 11:19, Yonggang Luo wrote:
> V1-V2
> Fixes whpx: Fixes include of whp-dispatch.h in whpx.h by
>    the suggestion of Philippe Mathieu-Daudé <philmd@redhat.com>
> Add new patch whpx: move whpx_lapic_state from header to c file
> 
> The test-vmstate can be passed under win32 too
> so enable it on win32,
> This is based on Bonzini's upstream tag along
> 
> Yonggang Luo (5):
>    cirrus/msys2: Exit powershell with $LastExitCode
>    cirrus/msys2: Cache msys2 mingw in a better way.
>    maintainers: Add me as Windows Hosted Continuous Integration
>      maintainer
>    whpx: Fixes include of whp-dispatch.h in whpx.h
>    whpx: move whpx_lapic_state from header to c file
> 
>   .cirrus.yml                  | 119 ++++++++++++++++++++---------------
>   MAINTAINERS                  |   6 ++
>   include/sysemu/whpx.h        |   9 +--
>   target/i386/whpx/whpx-apic.c |   7 +++
>   4 files changed, 84 insertions(+), 57 deletions(-)
> 

Queued, thanks.

Paolo



^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2021-01-07 11:36 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-07 10:19 [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes Yonggang Luo
2021-01-07 10:19 ` [PATCH v4 1/5] cirrus/msys2: Exit powershell with $LastExitCode Yonggang Luo
2021-01-07 11:16   ` Philippe Mathieu-Daudé
2021-01-07 10:19 ` [PATCH v4 2/5] cirrus/msys2: Cache msys2 mingw in a better way Yonggang Luo
2021-01-07 10:19 ` [PATCH v4 3/5] maintainers: Add me as Windows Hosted Continuous Integration maintainer Yonggang Luo
2021-01-07 11:17   ` Philippe Mathieu-Daudé
2021-01-07 10:19 ` [PATCH v4 4/5] whpx: Fixes include of whp-dispatch.h in whpx.h Yonggang Luo
2021-01-07 10:26   ` Marc-André Lureau
2021-01-07 11:17   ` Philippe Mathieu-Daudé
2021-01-07 10:19 ` [PATCH v4 5/5] whpx: move whpx_lapic_state from header to c file Yonggang Luo
2021-01-07 10:28   ` Marc-André Lureau
2021-01-07 10:55     ` Paolo Bonzini
2021-01-07 10:57       ` 罗勇刚(Yonggang Luo)
2021-01-07 10:28 ` [PATCH v4 0/5] Misc meson fixes along test-vmstate fixes Paolo Bonzini
2021-01-07 10:30 ` no-reply
2021-01-07 11:35 ` Paolo Bonzini

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.