feat: Carveout, localhost USB, SEP, MT, PCIe, Baseband, Disp PMU

.gitattributes

@@ -2,3 +2,8 @@
 *.h.inc         diff=c
 *.m             diff=objc
 *.py            diff=python
+*.rs            diff=rust
+*.rs.inc        diff=rust
+Cargo.lock      diff=toml merge=binary
+
+*.patch         -text -whitespace

.github/workflows/build.yaml

@@ -6,120 +6,84 @@ on:
   pull_request:
 
 jobs:
-  build_aarch64_softmmu_linux:
+  build_linux:
     runs-on: ubuntu-24.04
     steps:
-      - name: Install build dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y bash bc bison bsdextrautils bzip2 ca-certificates ccache clang dbus debianutils diffutils exuberant-ctags findutils flex g++ gcc gcovr genisoimage gettext git hostname libaio-dev libasan5 libasound2-dev libattr1-dev libbpf-dev libbrlapi-dev libbz2-dev libc6-dev libcacard-dev libcap-ng-dev libcapstone-dev libcmocka-dev libcurl4-gnutls-dev libdaxctl-dev libdrm-dev libepoxy-dev libfdt-dev libffi-dev libgbm-dev libgcrypt20-dev libglib2.0-dev libglusterfs-dev libgnutls28-dev libgtk-3-dev libibumad-dev libibverbs-dev libiscsi-dev libjemalloc-dev libjpeg-turbo8-dev libjson-c-dev liblttng-ust-dev liblzo2-dev libncursesw5-dev libnfs-dev libnuma-dev libpam0g-dev libpcre2-dev libpixman-1-dev libpmem-dev libpng-dev libpulse-dev librbd-dev librdmacm-dev libsasl2-dev libsdl2-dev libsdl2-image-dev libseccomp-dev libslirp-dev libsnappy-dev libspice-protocol-dev libspice-server-dev libssh-dev libsystemd-dev libtasn1-6-dev libubsan1 libudev-dev liburing-dev libusb-1.0-0-dev libusbredirhost-dev libvdeplug-dev libvirglrenderer-dev libvte-2.91-dev libxen-dev libxml2-dev libzstd-dev llvm locales make meson multipath-tools ncat nettle-dev ninja-build openssh-client pkgconf python3 python3-numpy python3-opencv python3-pillow python3-pip python3-sphinx python3-sphinx-rtd-theme python3-venv python3-yaml rpm2cpio sed sparse systemtap-sdt-dev tar tesseract-ocr tesseract-ocr-eng texinfo xfslibs-dev zlib1g-dev libtasn1-6 libtasn1-6-dev lzfse liblzfse-dev
-
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      - name: Build qemu
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential libtool meson ninja-build pkg-config libcapstone-dev device-tree-compiler libglib2.0-dev gnutls-bin libjpeg-turbo8-dev libpng-dev libslirp-dev libssh-dev libusb-1.0-0-dev liblzo2-dev libncurses5-dev libpixman-1-dev libsnappy-dev vde2 zstd libgnutls28-dev libgmp10 libgmp3-dev lzfse liblzfse-dev
+      - name: Build nettle 3.10.1
+        run: |
+          wget https://ftp.gnu.org/gnu/nettle/nettle-3.10.1.tar.gz
+          tar -xvf nettle-3.10.1.tar.gz
+          cd nettle-3.10.1
+          ./configure
+          make -j$(nproc)
+          sudo make install
+      - name: Build
         run: |
           mkdir build
           cd build
-          ../configure --target-list=aarch64-softmmu --disable-capstone --disable-slirp --enable-lzfse --disable-werror
+          PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig ../configure --target-list=aarch64-softmmu,x86_64-softmmu --enable-capstone --enable-slirp --enable-lzfse --enable-nettle --enable-gnutls --disable-werror
           make -j$(nproc)
-
-      - name: Install qemu
+      - name: Install
         run: |
           cd build
           make DESTDIR=$GITHUB_WORKSPACE/bin/ install
-
       - name: Publish binaries
         uses: actions/upload-artifact@v4
         with:
-          name: aarch64_softmmu_linux
+          name: linux
           path: ${{ github.workspace }}/bin/
 
-  build_aarch64_softmmu_macos:
-    runs-on: macos-latest
+  build_macos:
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      - name: Install build dependencies
+      - name: Install dependencies
         run: |
-          brew install ninja pixman lzfse
-
-      - name: Build qemu
+          brew install libtool meson ninja pkgconf capstone dtc glib gnutls jpeg-turbo libpng libslirp libssh libusb lzo ncurses nettle pixman snappy vde zstd lzfse nettle
+      - name: Build
         run: |
-          mkdir build
-          cd build
-          CFLAGS="$CFLAGS -I/opt/homebrew/include" LDFLAGS="$LDFLAGS -L/opt/homebrew/lib" C_INCLUDE_PATH="$C_INCLUDE_PATH:/opt/homebrew/include" LIBRARY_PATH="$LIBRARY_PATH:/opt/homebrew/lib" LIBTOOL="glibtool" ../configure --target-list=aarch64-softmmu --disable-sdl --disable-gtk --enable-cocoa --enable-lzfse --disable-werror
+          mkdir build && cd build
+          LIBTOOL="glibtool" ../configure --target-list=aarch64-softmmu,x86_64-softmmu --disable-bsd-user --disable-guest-agent --enable-lzfse --enable-slirp --enable-capstone --enable-curses --enable-libssh --enable-virtfs --enable-zstd --extra-cflags=-DNCURSES_WIDECHAR=1 --disable-sdl --disable-gtk --enable-cocoa --enable-lzfse --enable-nettle --enable-gnutls --disable-werror --extra-cflags="-I/opt/homebrew/include" --extra-ldflags="-L/opt/homebrew/lib"
           make -j$(sysctl -n hw.logicalcpu)
-
-      - name: Install qemu
+      - name: Install
         run: |
           cd build
           make DESTDIR=$GITHUB_WORKSPACE/bin/ install
-
       - name: Publish binaries
         uses: actions/upload-artifact@v4
         with:
-          name: aarch64_softmmu_macos
+          name: macos_aarch64
           path: ${{ github.workspace }}/bin/
 
-  build_all_linux:
-    runs-on: ubuntu-24.04
+  build_macos_x86_64:
+    runs-on: macos-13
     steps:
-      - name: Install build dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y bash bc bison bsdextrautils bzip2 ca-certificates ccache clang dbus debianutils diffutils exuberant-ctags findutils flex g++ gcc gcovr genisoimage gettext git hostname libaio-dev libasan5 libasound2-dev libattr1-dev libbpf-dev libbrlapi-dev libbz2-dev libc6-dev libcacard-dev libcap-ng-dev libcapstone-dev libcmocka-dev libcurl4-gnutls-dev libdaxctl-dev libdrm-dev libepoxy-dev libfdt-dev libffi-dev libgbm-dev libgcrypt20-dev libglib2.0-dev libglusterfs-dev libgnutls28-dev libgtk-3-dev libibumad-dev libibverbs-dev libiscsi-dev libjemalloc-dev libjpeg-turbo8-dev libjson-c-dev liblttng-ust-dev liblzo2-dev libncursesw5-dev libnfs-dev libnuma-dev libpam0g-dev libpcre2-dev libpixman-1-dev libpmem-dev libpng-dev libpulse-dev librbd-dev librdmacm-dev libsasl2-dev libsdl2-dev libsdl2-image-dev libseccomp-dev libslirp-dev libsnappy-dev libspice-protocol-dev libspice-server-dev libssh-dev libsystemd-dev libtasn1-6-dev libubsan1 libudev-dev liburing-dev libusb-1.0-0-dev libusbredirhost-dev libvdeplug-dev libvirglrenderer-dev libvte-2.91-dev libxen-dev libxml2-dev libzstd-dev llvm locales make meson multipath-tools ncat nettle-dev ninja-build openssh-client pkgconf python3 python3-numpy python3-opencv python3-pillow python3-pip python3-sphinx python3-sphinx-rtd-theme python3-venv python3-yaml rpm2cpio sed sparse systemtap-sdt-dev tar tesseract-ocr tesseract-ocr-eng texinfo xfslibs-dev zlib1g-dev libtasn1-6 libtasn1-6-dev lzfse liblzfse-dev
-
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      - name: Build qemu
+      - name: Install dependencies
         run: |
-          mkdir build
-          cd build
-          ../configure --enable-lzfse --disable-werror
-          make -j$(nproc)
-
-      - name: Install qemu
+          brew install libtool meson ninja pkgconf capstone dtc glib gnutls jpeg-turbo libpng libslirp libssh libusb lzo ncurses nettle pixman snappy vde zstd lzfse nettle
+      - name: Build
         run: |
-          cd build
-          make DESTDIR=$GITHUB_WORKSPACE/bin/ install
-
-      - name: Publish binaries
-        uses: actions/upload-artifact@v4
-        with:
-          name: linux
-          path: ${{ github.workspace }}/bin/
-
-  build_all_macos:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Install build dependencies
-        run: |
-          brew install ninja pixman lzfse
-
-      - name: Build qemu
-        run: |
-          mkdir build
-          cd build
-          CFLAGS="$CFLAGS -I/opt/homebrew/include" LDFLAGS="$LDFLAGS -L/opt/homebrew/lib" C_INCLUDE_PATH="$C_INCLUDE_PATH:/opt/homebrew/include" LIBRARY_PATH="$LIBRARY_PATH:/opt/homebrew/lib" LIBTOOL="glibtool" ../configure --disable-sdl --disable-gtk --enable-cocoa --enable-lzfse --disable-werror
+          mkdir build && cd build
+          LIBTOOL="glibtool" ../configure --target-list=aarch64-softmmu,x86_64-softmmu --disable-bsd-user --disable-guest-agent --enable-lzfse --enable-slirp --enable-capstone --enable-curses --enable-libssh --enable-virtfs --enable-zstd --extra-cflags=-DNCURSES_WIDECHAR=1 --disable-sdl --disable-gtk --enable-cocoa --enable-lzfse --enable-nettle --enable-gnutls --disable-werror --extra-cflags="-I/opt/homebrew/include" --extra-ldflags="-L/opt/homebrew/lib"
           make -j$(sysctl -n hw.logicalcpu)
-
-      - name: Install qemu
+      - name: Install
         run: |
           cd build
           make DESTDIR=$GITHUB_WORKSPACE/bin/ install
-
       - name: Publish binaries
         uses: actions/upload-artifact@v4
         with:
-          name: macos
+          name: macos_x86_64
           path: ${{ github.workspace }}/bin/

.gitlab-ci.d/base.yml

@@ -128,7 +128,7 @@ variables:
       when: manual
 
     # Jobs can run if any jobs they depend on were successful
-    - if: '$QEMU_JOB_SKIPPED && $CI_PROJECT_NAMESPACE == $QEMU_CI_UPSTREAM && $CI_COMMIT_BRANCH =~ /staging-[[:digit:]]+\.[[:digit:]]/'
+    - if: '$CI_PROJECT_NAMESPACE == $QEMU_CI_UPSTREAM && $CI_COMMIT_BRANCH =~ /staging-[[:digit:]]+\.[[:digit:]]/'
       when: on_success
       variables:
         QEMU_CI_CONTAINER_TAG: $CI_COMMIT_REF_SLUG

.gitlab-ci.d/buildtest-template.yml

@@ -8,7 +8,11 @@
     key: "$CI_JOB_NAME"
     when: always
   before_script:
+    - source scripts/ci/gitlab-ci-section
+    - section_start setup "Pre-script setup"
     - JOBS=$(expr $(nproc) + 1)
+    - cat /packages.txt
+    - section_end setup
   script:
     - export CCACHE_BASEDIR="$(pwd)"
     - export CCACHE_DIR="$CCACHE_BASEDIR/ccache"
@@ -18,6 +22,7 @@
     - mkdir build
     - cd build
     - ccache --zero-stats
+    - section_start configure "Running configure"
     - ../configure --enable-werror --disable-docs --enable-fdt=system
           ${TARGETS:+--target-list="$TARGETS"}
           $CONFIGURE_ARGS ||
@@ -26,11 +31,16 @@
       then
         pyvenv/bin/meson configure . -Dbackend_max_links="$LD_JOBS" ;
       fi || exit 1;
+    - section_end configure
+    - section_start build "Building QEMU"
     - $MAKE -j"$JOBS"
+    - section_end build
+    - section_start test "Running tests"
     - if test -n "$MAKE_CHECK_ARGS";
       then
         $MAKE -j"$JOBS" $MAKE_CHECK_ARGS ;
       fi
+    - section_end test
     - ccache --show-stats
 
 # We jump some hoops in common_test_job_template to avoid
@@ -45,22 +55,29 @@
     exclude:
       - build/**/*.p
       - build/**/*.a.p
-      - build/**/*.fa.p
       - build/**/*.c.o
       - build/**/*.c.o.d
-      - build/**/*.fa
 
 .common_test_job_template:
   extends: .base_job_template
   stage: test
   image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG
   script:
+    - source scripts/ci/gitlab-ci-section
+    - section_start buildenv "Setting up to run tests"
     - scripts/git-submodule.sh update roms/SLOF
-    - meson subprojects download $(cd build/subprojects && echo *)
+    - build/pyvenv/bin/meson subprojects download $(cd build/subprojects && echo *)
     - cd build
     - find . -type f -exec touch {} +
     # Avoid recompiling by hiding ninja with NINJA=":"
+    # We also have to pre-cache the functional tests manually in this case
+    - if [ "x${QEMU_TEST_CACHE_DIR}" != "x" ]; then
+        $MAKE precache-functional ;
+      fi
+    - section_end buildenv
+    - section_start test "Running tests"
     - $MAKE NINJA=":" $MAKE_CHECK_ARGS
+    - section_end test
 
 .native_test_job_template:
   extends: .common_test_job_template
@@ -73,12 +90,13 @@
     reports:
       junit: build/meson-logs/testlog.junit.xml
 
-.avocado_test_job_template:
+.functional_test_job_template:
   extends: .common_test_job_template
   cache:
     key: "${CI_JOB_NAME}-cache"
     paths:
       - ${CI_PROJECT_DIR}/avocado-cache
+      - ${CI_PROJECT_DIR}/functional-cache
     policy: pull-push
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
@@ -87,6 +105,7 @@
     paths:
       - build/tests/results/latest/results.xml
       - build/tests/results/latest/test-results
+      - build/tests/functional/*/*/*.log
     reports:
       junit: build/tests/results/latest/results.xml
   before_script:
@@ -97,11 +116,13 @@
     - echo -e '[job.output.testlogs]\nstatuses = ["FAIL", "INTERRUPT"]'
            >> ~/.config/avocado/avocado.conf
     - if [ -d ${CI_PROJECT_DIR}/avocado-cache ]; then
-        du -chs ${CI_PROJECT_DIR}/avocado-cache ;
+        du -chs ${CI_PROJECT_DIR}/*-cache ;
       fi
     - export AVOCADO_ALLOW_UNTRUSTED_CODE=1
+    - export QEMU_TEST_ALLOW_UNTRUSTED_CODE=1
+    - export QEMU_TEST_CACHE_DIR=${CI_PROJECT_DIR}/functional-cache
   after_script:
     - cd build
-    - du -chs ${CI_PROJECT_DIR}/avocado-cache
+    - du -chs ${CI_PROJECT_DIR}/*-cache
   variables:
     QEMU_JOB_AVOCADO: 1