Merge v7.0.0 (#108)

* Merge upstream v7.0.0
* Convert w64 build to MSYS2 (Cygwin has no sufficiently new glib2.0) - It is now fully standalone.

Author: vintagepc

.cirrus.yml

@@ -1,61 +1,6 @@
 env:
   CIRRUS_CLONE_DEPTH: 1
 
-freebsd_12_task:
-  freebsd_instance:
-    image_family: freebsd-12-2
-    cpu: 8
-    memory: 8G
-  install_script:
-    - ASSUME_ALWAYS_YES=yes pkg bootstrap -f ;
-    - pkg install -y bash curl cyrus-sasl git glib gmake gnutls gsed
-          nettle perl5 pixman pkgconf png usbredir ninja
-  script:
-    - mkdir build
-    - cd build
-    # TODO: Enable gnutls again once FreeBSD's libtasn1 got fixed
-    # See: https://gitlab.com/gnutls/libtasn1/-/merge_requests/71
-    - ../configure --enable-werror --disable-gnutls
-      || { cat config.log meson-logs/meson-log.txt; exit 1; }
-    - gmake -j$(sysctl -n hw.ncpu)
-    - gmake -j$(sysctl -n hw.ncpu) check V=1
-
-macos_task:
-  osx_instance:
-    image: catalina-base
-  install_script:
-    - brew install pkg-config python gnu-sed glib pixman make sdl2 bash ninja
-  script:
-    - mkdir build
-    - cd build
-    - ../configure --python=/usr/local/bin/python3 --enable-werror
-                   --extra-cflags='-Wno-error=deprecated-declarations'
-                   || { cat config.log meson-logs/meson-log.txt; exit 1; }
-    - gmake -j$(sysctl -n hw.ncpu)
-    - gmake check-unit V=1
-    - gmake check-block V=1
-    - gmake check-qapi-schema V=1
-    - gmake check-softfloat V=1
-    - gmake check-qtest-x86_64 V=1
-
-macos_xcode_task:
-  osx_instance:
-    # this is an alias for the latest Xcode
-    image: catalina-xcode
-  install_script:
-    - brew install pkg-config gnu-sed glib pixman make sdl2 bash ninja
-  script:
-    - mkdir build
-    - cd build
-    - ../configure --extra-cflags='-Wno-error=deprecated-declarations' --enable-modules
-                   --enable-werror --cc=clang || { cat config.log meson-logs/meson-log.txt; exit 1; }
-    - gmake -j$(sysctl -n hw.ncpu)
-    - gmake check-unit V=1
-    - gmake check-block V=1
-    - gmake check-qapi-schema V=1
-    - gmake check-softfloat V=1
-    - gmake check-qtest-x86_64 V=1
-
 windows_msys2_task:
   timeout_in: 90m
   windows_container:
@@ -67,7 +12,7 @@ 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_URL: https://github.com/msys2/msys2-installer/releases/download/2021-04-19/msys2-base-x86_64-20210419.sfx.exe
     MSYS2_FINGERPRINT: 0
     MSYS2_PACKAGES: "
       diffutils git grep make pkg-config sed
@@ -87,7 +32,6 @@ windows_msys2_task:
       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
@@ -130,7 +74,7 @@ windows_msys2_task:
         taskkill /F /FI "MODULES eq msys-2.0.dll"
         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 -Syuu --overwrite=*"
         Write-Output "Core install time taken: $((Get-Date).Subtract($start_time))"
         $start_time = Get-Date
 

.gitattributes

@@ -1,3 +1,4 @@
 *.c.inc         diff=c
 *.h.inc         diff=c
+*.m             diff=objc
 *.py            diff=python

.github/workflows/build.yml

@@ -18,8 +18,8 @@ jobs:
   build_linux:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, 'NO_BUILD')"
-    # Steps represent a sequence of tasks that will be executed as part of the job
+    # if: "!contains(github.event.head_commit.message, 'NO_BUILD')"
+  #   # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - name: Checkout ${{ github.event.pull_request.head.ref }}
@@ -88,7 +88,7 @@ jobs:
           cd ${{ runner.workspace }}/MINI404/build
           mv buddy-softmmu Mini404-dev-linux
           mv assets Mini404-dev-linux
-          mv pc-bios Mini404-dev-linux
+          mkdir Mini404-dev-linux/pc-bios && mv pc-bios/keymaps Mini404-dev-linux/pc-bios/
           tar -jhcvf Mini404-dev-linux.tar.bz2 Mini404-dev-linux
     - name: Upload artifact
       if: ${{ !github.event.pull_request }}
@@ -100,10 +100,10 @@ jobs:
   build_macos:
     # The type of runner that the job will run on
     runs-on: macos-latest
-    if: "!contains(github.event.head_commit.message, 'NO_BUILD')"
-    # Steps represent a sequence of tasks that will be executed as part of the job
+  #   if: "!contains(github.event.head_commit.message, 'NO_BUILD')"
+  #   # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+  #   # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - name: Checkout ${{ github.event.pull_request.head.ref }}
       uses: actions/[email protected]
       if: ${{ github.event.pull_request }}
@@ -134,6 +134,9 @@ jobs:
       run: |
         cd ${{ runner.workspace }}/MINI404/build
         mv buddy-softmmu Mini404-dev-macos
+        mv assets Mini404-dev-macos
+          mkdir Mini404-dev-macos/pc-bios
+          mv pc-bios/keymaps Mini404-dev-macos/pc-bios/
         tar -jhcvf Mini404-dev-macos.tar.bz2 Mini404-dev-macos
 
     - name: Upload artifact
@@ -143,32 +146,16 @@ jobs:
         name: Binaries
         path: ${{ runner.workspace }}/MINI404/build/Mini404-dev-macos.tar.bz2
 
-  build_cygwin:
+  build_msys:
     # The type of runner that the job will run on
-    runs-on: windows-2019
+    runs-on: windows-latest
     if: "!contains(github.event.head_commit.message, 'NO_BUILD')"
     steps:
-      - uses: actions/cache@v1
-        with:
-          path: C:\tools\chococache
-          key: ${{ runner.os }}-cygwin-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-cygwin-
-      - name: Cygwin package cache
-        uses: actions/cache@v1
-        with:
-          path: C:\tools\cygcache
-          key: ${{ runner.os }}-cygwinpkgs-1_1
-          restore-keys: |
-            ${{ runner.os }}-cygwinpkgs-
-      - name: Install cygwin
-        run: |
-          choco config set cacheLocation C:\tools\chococache
-          choco install --no-progress cygwin
-      - name: Install cygwin dependencies
-        run: |
-          C:\tools\cygwin\cygwinsetup.exe -qgnNdO -l C:/tools/cygcache -R C:/tools/cygwin -s http://mirrors.kernel.org/sourceware/cygwin/ -P "mingw64-x86_64-gcc-g++,mingw64-x86_64-glew,mingw64-x86_64-freeglut,mingw64-x86_64-curl,mingw64-x86_64-glib-2.0,mingw64-x86_64-gtk3,mingw64-x86_64-openssl,mingw64-x86_64-libepoxy,mingw64-x86_64-pixman,mingw64-x86_64-pkg-config,mingw64-x86_64-libusb1.0,mingw64-x86_64-usbredir,python3-setuptools,git,gcc-core,make,zip,ninja"
-        shell: cmd
+      - name: Install MSYS2
+        uses: msys2/setup-msys2@v2
+        with: 
+          msystem: MINGW64
+          install: make git zip mingw-w64-x86_64-diffutils diffutils python mingw-w64-x86_64-ninja mingw-w64-x86_64-toolchain mingw-w64-x86_64-gtk3 mingw-w64-x86_64-freeglut mingw-w64-x86_64-glew mingw-w64-x86_64-libusb mingw-w64-x86_64-SDL2  mingw-w64-x86_64-pixman  mingw-w64-x86_64-glib2 python-setuptools mingw-w64-x86_64-make mingw-w64-x86_64-curl mingw-w64-x86_64-libjxl mingw-w64-x86_64-SDL2_image
 
       - name: Fix CRLF Checkout
         run: git config --global core.autocrlf false
@@ -193,40 +180,33 @@ jobs:
         # recognize the `--no-pie` argument... not that it matters because we don't need to build the ROMs here.
       - name: Configure build
         run: |
-          cd MINI404
           git submodule update --init capstone dtc meson slirp ui/keycodemapdb tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3
           mkdir build
           cd build
-          set PATH=C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin
-          bash.exe -c "../configure --with-git-submodules=ignore --cross-prefix=x86_64-w64-mingw32- --target-list=buddy-softmmu --enable-gtk --enable-libusb"
-          bash.exe -c "sed -i 's/LDFLAGS_NOPIE=-no-pie/LDFLAGS_NOPIE=/g' config-host.mak" 
-        shell: cmd
+          ../configure --with-git-submodules=ignore --target-list=buddy-softmmu --enable-gtk --enable-libusb --disable-werror
+        shell: msys2 {0}
 
       - name: Build
         run: |
-          cd ${{runner.workspace}}\MINI404\build
-          pwd
-          set PATH=C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin
-          bash.exe -c "make -j3"
-        shell: cmd
+          cd build
+          ninja
+        shell: msys2 {0}
       - name: Assemble artifacts and libraries
-        if: ${{ !github.event.pull_request }}
+#        if: ${{ !github.event.pull_request }}
         run: |
-          cd ${{ runner.workspace }}/MINI404/build
+          cd build
           mkdir Mini404-dev-w64
-          mv qemu-system-buddy.exe Mini404-dev-w64
+          mv qemu-*.exe Mini404-dev-w64
           mv assets Mini404-dev-w64
           cd Mini404-dev-w64
-          set PATH=C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin
-          bash.exe -c "mkdir pc-bios && echo \"Placeholder. DO NOT DELETE THIS DIRECTORY, IT MUST EXIST OR QEMU WILL HANG ON BOOT\" > pc-bios/README.txt" 
-          bash.exe -c "for i in `ldd qemu-system-buddy.exe | grep \"not found\" | cut -f2 | cut -d\" \" -f1 | sort | uniq`; do echo Copying $i; cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/$i .; done"
-          bash.exe -c "while `ldd *.dll | grep -q \"not found\"`; do for i in `ldd *.dll | grep \"not found\" | cut -f2 | cut -d\" \" -f1 | sort | uniq`; do echo Copying $i; cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/$i .; done; sleep 2; done" 
+          mkdir pc-bios && mv ../pc-bios/keymaps pc-bios/
+          for i in `cat ../../.github/workflows/dll-list.txt`; do echo "Copying $i"; cp /mingw64/bin/$i .; done;
           cd ..
           zip -r Mini404-dev-w64.zip Mini404-dev-w64
-        shell: cmd
+        shell: msys2 {0}
 
       - name: Upload Cygwin artifact
-        if: ${{ !github.event.pull_request }}
+#        if: ${{ !github.event.pull_request }}
         uses: actions/upload-artifact@v2
         with:
           name: Binaries
@@ -235,7 +215,7 @@ jobs:
   Publish:
     runs-on: ubuntu-latest
     if: ${{ !github.event.pull_request }}
-    needs: [build_linux, build_cygwin, build_macos]
+    needs: [build_linux, build_msys, build_macos]
     steps:
       - name: Retrieve platform binaries
         uses: actions/download-artifact@v2

.github/workflows/dll-list.txt

@@ -0,0 +1,65 @@
+glew32.dll
+libatk-1.0-0.dll
+libbrotlicommon.dll
+libbrotlidec.dll
+libbrotlienc.dll
+libbz2-1.dll
+libcairo-2.dll
+libcairo-gobject-2.dll
+libcrypto-1_1-x64.dll
+libcurl-4.dll
+libdatrie-1.dll
+libdeflate.dll
+libepoxy-0.dll
+libexpat-1.dll
+libffi-7.dll
+libfontconfig-1.dll
+libfreeglut.dll
+libfreetype-6.dll
+libfribidi-0.dll
+libgcc_s_seh-1.dll
+libgdk-3-0.dll
+libgdk_pixbuf-2.0-0.dll
+libgio-2.0-0.dll
+libglib-2.0-0.dll
+libgmodule-2.0-0.dll
+libgobject-2.0-0.dll
+libgraphite2.dll
+libgtk-3-0.dll
+libharfbuzz-0.dll
+libharfbuzz-gobject-0.dll
+libharfbuzz-icu-0.dll
+libharfbuzz-subset-0.dll
+libiconv-2.dll
+libidn2-0.dll
+libintl-8.dll
+libjbig-0.dll
+libjpeg-8.dll
+libjxl.dll
+libLerc.dll
+liblzma-5.dll
+liblzo2-2.dll
+libncursesw6.dll
+libnghttp2-14.dll
+libpango-1.0-0.dll
+libpangocairo-1.0-0.dll
+libpangoft2-1.0-0.dll
+libpangowin32-1.0-0.dll
+libpcre-1.dll
+libpixman-1-0.dll
+libpng16-16.dll
+libpsl-5.dll
+libssh2-1.dll
+libssl-1_1-x64.dll
+libssp-0.dll
+libstdc++-6.dll
+libthai-0.dll
+libtiff-5.dll
+libunistring-2.dll
+libusb-1.0.dll
+libwebp-7.dll
+libwinpthread-1.dll
+libzstd.dll
+SDL2.dll
+SDL2_image.dll
+zlib1.dll

.gitignore

@@ -14,3 +14,6 @@ GTAGS
 *~
 *.ast_raw
 *.depend_raw
+*.swp
+*.patch
+*.gcov

.gitmodules

@@ -64,6 +64,9 @@
 [submodule "roms/vbootrom"]
 	path = roms/vbootrom
 	url = https://gitlab.com/qemu-project/vbootrom.git
+[submodule "tests/lcitool/libvirt-ci"]
+	path = tests/lcitool/libvirt-ci
+	url = https://gitlab.com/libvirt/libvirt-ci.git
 [submodule "hw/arm/prusa/3rdParty/shmemq404"]
 	path = hw/arm/prusa/3rdParty/shmemq404
 	url = https://github.com/vintagepc/shmemq404.git

.mailmap

@@ -27,6 +27,14 @@ Paul Brook <[email protected]> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-714662
 Thiemo Seufer <[email protected]> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
 malc <[email protected]> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
 
+# Corrupted Author fields
+Aaron Larson <[email protected]> [email protected]
+Andreas Färber <[email protected]> Andreas Färber <andreas.faerber>
+Jason Wang <[email protected]> Jason Wang <jasowang>
+Marek Dolata <[email protected]> [email protected] <[email protected]>
+Michael Ellerman <[email protected]> [email protected] <[email protected]>
+Nick Hudson <[email protected]> [email protected] <[email protected]>
+
 # There is also a:
 #    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
 # for the cvs2svn initialization commit e63c3dc74bf.
@@ -46,8 +54,10 @@ Aleksandar Rikalo <[email protected]> <[email protected]>
 Aleksandar Rikalo <[email protected]> <[email protected]>
 Alexander Graf <[email protected]> <[email protected]>
 Anthony Liguori <[email protected]> Anthony Liguori <[email protected]>
+Christian Borntraeger <[email protected]> <[email protected]>
 Filip Bozuta <[email protected]> <[email protected]>
-Frederic Konrad <[email protected]> <[email protected]>
+Frederic Konrad <[email protected]> <[email protected]>
+Frederic Konrad <[email protected]> <[email protected]>
 Greg Kurz <[email protected]> <[email protected]>
 Huacai Chen <[email protected]> <[email protected]>
 Huacai Chen <[email protected]> <[email protected]>
@@ -58,13 +68,16 @@ Paul Burton <[email protected]> <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
+Philippe Mathieu-Daudé <[email protected]> <[email protected]>
 Stefan Brankovic <[email protected]> <[email protected]>
 Yongbok Kim <[email protected]> <[email protected]>
 
 # Also list preferred name forms where people have changed their
 # git author config, or had utf8/latin1 encoding issues.
 Aaron Lindsay <[email protected]>
+Aaron Larson <[email protected]>
 Alexey Gerasimenko <[email protected]>
+Alex Chen <[email protected]>
 Alex Ivanov <[email protected]>
 Andreas Färber <[email protected]>
 Bandan Das <[email protected]>
@@ -95,8 +108,11 @@ Gautham R. Shenoy <[email protected]>
 Gautham R. Shenoy <[email protected]>
 Gonglei (Arei) <[email protected]>
 Guang Wang <[email protected]>
+Haibin Zhang <[email protected]>
 Hailiang Zhang <[email protected]>
+Hanna Reitz <[email protected]> <[email protected]>
 Hervé Poussineau <[email protected]>
+Hyman Huang <[email protected]>
 Jakub Jermář <[email protected]>
 Jakub Jermář <[email protected]>
 Jean-Christophe Dubois <[email protected]>
@@ -130,9 +146,11 @@ Nicholas Thomas <[email protected]>
 Nikunj A Dadhania <[email protected]>
 Orit Wasserman <[email protected]>
 Paolo Bonzini <[email protected]>
+Pan Nengyuan <[email protected]>
 Pavel Dovgaluk <[email protected]>
 Pavel Dovgaluk <[email protected]>
 Pavel Dovgaluk <[email protected]>
+Peter Chubb <[email protected]>
 Peter Crosthwaite <[email protected]>
 Peter Crosthwaite <[email protected]>
 Peter Crosthwaite <[email protected]>