Merge v7.2.0 (#141)

* Merge v7.2.0
* Implement RNG Interrupt to fix test hang
* Fix merge fallout (armv7m_load_kernel, blk_pread) MSYS, OSX builds

Author: vintagepc

.cirrus.yml

@@ -10,9 +10,9 @@ windows_msys2_task:
     memory: 8G
   env:
     CIRRUS_SHELL: powershell
-    MSYS: winsymlinks:nativestrict
+    MSYS: winsymlinks:native
     MSYSTEM: MINGW64
-    MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2021-04-19/msys2-base-x86_64-20210419.sfx.exe
+    MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2022-06-03/msys2-base-x86_64-20220603.sfx.exe
     MSYS2_FINGERPRINT: 0
     MSYS2_PACKAGES: "
       diffutils git grep make pkg-config sed

.github/workflows/build.yml

@@ -122,7 +122,9 @@ jobs:
         submodules: true
 
     - name: Install dependencies
-      run: brew install libffi gettext glib pkg-config autoconf automake pixman ninja make
+      run: |
+        brew install libffi gettext glib pkg-config autoconf automake pixman ninja make
+        pip3 install setuptools
 
     - name: Configure build
       run: cd ${{ runner.workspace }}/MINI404 && ./configure --target-list="buddy-softmmu"
@@ -186,10 +188,9 @@ jobs:
         # recognize the `--no-pie` argument... not that it matters because we don't need to build the ROMs here.
       - name: Configure build
         run: |
-          git submodule update --init capstone dtc meson slirp ui/keycodemapdb tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3
           mkdir build
           cd build
-          ../configure --with-git-submodules=ignore --target-list=buddy-softmmu --enable-gtk --enable-libusb --disable-werror
+          ../configure --target-list=buddy-softmmu --enable-gtk --enable-libusb --disable-werror
         shell: msys2 {0}
 
       - name: Build

.gitignore

@@ -1,10 +1,14 @@
 /GNUmakefile
 /out/
 /build/
+/.cache/
+/.vscode/
 *.pyc
 .sdk
 .stgit-*
 .git-submodule-status
+.clang-format
+.gdb_history
 cscope.*
 tags
 TAGS

.gitmodules

@@ -31,9 +31,6 @@
 [submodule "ui/keycodemapdb"]
 	path = ui/keycodemapdb
 	url = https://gitlab.com/qemu-project/keycodemapdb.git
-[submodule "capstone"]
-	path = capstone
-	url = https://gitlab.com/qemu-project/capstone.git
 [submodule "roms/seabios-hppa"]
 	path = roms/seabios-hppa
 	url = https://gitlab.com/qemu-project/seabios-hppa.git
@@ -49,9 +46,6 @@
 [submodule "roms/edk2"]
 	path = roms/edk2
 	url = https://gitlab.com/qemu-project/edk2.git
-[submodule "slirp"]
-	path = slirp
-	url = https://gitlab.com/qemu-project/libslirp.git
 [submodule "roms/opensbi"]
 	path = roms/opensbi
 	url = 	https://gitlab.com/qemu-project/opensbi.git
@@ -67,7 +61,6 @@
 [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
-
+[submodule "subprojects/libvfio-user"]
+	path = subprojects/libvfio-user
+	url = https://gitlab.com/qemu-project/libvfio-user.git

.mailmap

@@ -62,13 +62,17 @@ Greg Kurz <[email protected]> <[email protected]>
 Huacai Chen <[email protected]> <[email protected]>
 Huacai Chen <[email protected]> <[email protected]>
 James Hogan <[email protected]> <[email protected]>
-Leif Lindholm <[email protected]> <[email protected]>
+Leif Lindholm <[email protected]> <[email protected]>
+Leif Lindholm <[email protected]> <[email protected]>
 Radoslaw Biernacki <[email protected]> <[email protected]>
+Paul Brook <[email protected]> <[email protected]>
 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]>
+Philippe Mathieu-Daudé <[email protected]> <[email protected]>
+Philippe Mathieu-Daudé <[email protected]> <[email protected]>
+Philippe Mathieu-Daudé <[email protected]> <[email protected]>
 Stefan Brankovic <[email protected]> <[email protected]>
 Yongbok Kim <[email protected]> <[email protected]>
 

.travis.yml

@@ -218,12 +218,11 @@ jobs:
         - TEST_CMD="make check check-tcg V=1"
         - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user"
         - UNRELIABLE=true
-        - DFLTCC=0
       script:
         - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
         - |
           if [ "$BUILD_RC" -eq 0 ] ; then
-              mv pc-bios/s390-ccw/*.img pc-bios/ ;
+              mv pc-bios/s390-ccw/*.img qemu-bundle/usr/local/share/qemu ;
               ${TEST_CMD} ;
           else
               $(exit $BUILD_RC);
@@ -258,7 +257,7 @@ jobs:
       env:
         - CONFIG="--disable-containers --audio-drv-list=sdl --disable-user
                   --target-list-exclude=${MAIN_SOFTMMU_TARGETS}"
-        - DFLTCC=0
+
     - name: "[s390x] GCC (user)"
       arch: s390x
       dist: focal
@@ -270,7 +269,7 @@ jobs:
           - ninja-build
       env:
         - CONFIG="--disable-containers --disable-system"
-        - DFLTCC=0
+
     - name: "[s390x] Clang (disable-tcg)"
       arch: s390x
       dist: focal
@@ -304,4 +303,3 @@ jobs:
         - CONFIG="--disable-containers --disable-tcg --enable-kvm
                   --disable-tools --host-cc=clang --cxx=clang++"
         - UNRELIABLE=true
-        - DFLTCC=0

.vscode/tasks.json

@@ -6,7 +6,7 @@
         {
             "label": "Configure QEMU",
             "type": "shell",
-            "command": "./configure --target-list=buddy-softmmu --disable-docs --enable-libusb",
+            "command": "./configure --target-list=buddy-softmmu,xtensa-softmmu --disable-docs --enable-libusb",
             "group": "build",
             "presentation": {
                 "echo": true,
@@ -33,6 +33,21 @@
             },
             "problemMatcher": []
         },
+        {
+            "label": "Configure QEMU (Profiling)",
+            "type": "shell",
+            "command": "CFLAGS=\"\" ./configure --target-list=buddy-softmmu --disable-docs --enable-libusb --enable-gprof --enable-profiler",
+            "group": "build",
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": true
+            },
+            "problemMatcher": []
+        },
         {
             "label": "Configure QEMU (Debugging)",
             "type": "shell",

Kconfig.host

@@ -22,15 +22,12 @@ config TPM
 
 config VHOST_USER
     bool
-    select VHOST
 
 config VHOST_VDPA
     bool
-    select VHOST
 
 config VHOST_KERNEL
     bool
-    select VHOST
 
 config VIRTFS
     bool
@@ -45,3 +42,7 @@ config MULTIPROCESS_ALLOWED
 config FUZZ
     bool
     select SPARSE_MEM
+
+config VFIO_USER_SERVER_ALLOWED
+    bool
+    imply VFIO_USER_SERVER