diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index d054349030..e2553e7326 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -36,9 +36,9 @@ build-system-ubuntu: - .native_build_job_template - .native_build_artifact_template needs: - - job: amd64-ubuntu2204-container + - job: amd64-ubuntu2404-container variables: - IMAGE: ubuntu2204 + IMAGE: ubuntu2404 CONFIGURE_ARGS: --enable-docs --enable-rust TARGETS: alpha-softmmu microblaze-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build @@ -49,7 +49,7 @@ check-system-ubuntu: - job: build-system-ubuntu artifacts: true variables: - IMAGE: ubuntu2204 + IMAGE: ubuntu2404 MAKE_CHECK_ARGS: check functional-system-ubuntu: @@ -58,7 +58,7 @@ functional-system-ubuntu: - job: build-system-ubuntu artifacts: true variables: - IMAGE: ubuntu2204 + IMAGE: ubuntu2404 MAKE_CHECK_ARGS: check-functional build-system-debian: @@ -577,9 +577,9 @@ functional-cfi-x86_64: tsan-build: extends: .native_build_job_template needs: - - job: amd64-ubuntu2204-container + - job: amd64-ubuntu2404-container variables: - IMAGE: ubuntu2204 + IMAGE: ubuntu2404 CONFIGURE_ARGS: --enable-tsan --cc=clang --cxx=clang++ --enable-trace-backends=ust --disable-slirp TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user @@ -591,10 +591,10 @@ tsan-build: gcov: extends: .native_build_job_template needs: - - job: amd64-ubuntu2204-container + - job: amd64-ubuntu2404-container timeout: 80m variables: - IMAGE: ubuntu2204 + IMAGE: ubuntu2404 CONFIGURE_ARGS: --enable-gcov TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu MAKE_CHECK_ARGS: check-unit check-softfloat diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 515e7382f2..87c20094d2 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -13,10 +13,10 @@ amd64-debian-container: variables: NAME: debian -amd64-ubuntu2204-container: +amd64-ubuntu2404-container: extends: .container_job_template variables: - NAME: ubuntu2204 + NAME: ubuntu2404 amd64-opensuse-leap-container: extends: .container_job_template @@ -58,7 +58,7 @@ weekly-container-builds: # containers - amd64-alpine-container - amd64-debian-container - - amd64-ubuntu2204-container + - amd64-ubuntu2404-container - amd64-opensuse-leap-container - python-container - amd64-fedora-rust-nightly-container diff --git a/docs/devel/testing/main.rst b/docs/devel/testing/main.rst index 3408b5836d..c6821a36d9 100644 --- a/docs/devel/testing/main.rst +++ b/docs/devel/testing/main.rst @@ -711,13 +711,13 @@ https://github.com/google/sanitizers/wiki/ThreadSanitizerCppManual Thread Sanitizer in Docker ~~~~~~~~~~~~~~~~~~~~~~~~~~ -TSan is currently supported in the ubuntu2204 docker. +TSan is currently supported in all our host docker images (for instance, ubuntu2404). The test-tsan test will build using TSan and then run make check. .. code:: - make docker-test-tsan@ubuntu2204 + make docker-test-tsan@ubuntu2404 TSan warnings under docker are placed in files located at build/tsan/. diff --git a/net/af-xdp.c b/net/af-xdp.c index 1ffd6363a8..72d75748c6 100644 --- a/net/af-xdp.c +++ b/net/af-xdp.c @@ -458,7 +458,7 @@ int net_init_af_xdp(const Netdev *netdev, g_autofree int *sock_fds = NULL; int i, queues; Error *err = NULL; - AFXDPState *s; + AFXDPState *s = NULL; bool inhibit; ifindex = if_nametoindex(opts->ifname); diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2404.docker similarity index 95% rename from tests/docker/dockerfiles/ubuntu2204.docker rename to tests/docker/dockerfiles/ubuntu2404.docker index 4617bbe1f6..26bc2dd94f 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2404.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all ubuntu-2204 qemu +# $ lcitool dockerfile --layers all ubuntu-2404 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/ubuntu:22.04 +FROM docker.io/library/ubuntu:24.04 RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ @@ -13,6 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ bash \ bc \ + bindgen \ bison \ bsdextrautils \ bzip2 \ @@ -32,7 +33,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ hostname \ libaio-dev \ - libasan6 \ + libasan8 \ libasound2-dev \ libattr1-dev \ libbpf-dev \ @@ -43,7 +44,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libcap-ng-dev \ libcapstone-dev \ libcbor-dev \ - libclang-dev \ + libclang-rt-dev \ libcmocka-dev \ libcurl4-gnutls-dev \ libdaxctl-dev \ @@ -99,6 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libvdeplug-dev \ libvirglrenderer-dev \ libvte-2.91-dev \ + libxdp-dev \ libxen-dev \ libzstd-dev \ llvm \ @@ -166,3 +168,5 @@ ARG USER ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi + +ENV ENABLE_RUST=1 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index fa545cf1f4..e0da0d2de1 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -151,7 +151,7 @@ fedora_rustup_nightly_extras = [ 'RUN $CARGO --list\n', ] -ubuntu2204_rust_extras = [ +ubuntu2404_rust_extras = [ "ENV RUSTC=/usr/bin/rustc-1.83\n", "ENV RUSTDOC=/usr/bin/rustdoc-1.83\n", "ENV CARGO_HOME=/usr/local/cargo\n", @@ -229,10 +229,8 @@ try: trailer="".join(debian13_extras)) generate_dockerfile("fedora", "fedora-43") generate_dockerfile("opensuse-leap", "opensuse-leap-16") - generate_dockerfile("ubuntu2204", "ubuntu-2204", - trailer="".join(ubuntu2204_rust_extras), - # https://bugs.launchpad.net/ubuntu/+source/rustc-1.83/+bug/2120318 - enable_rust=False) + generate_dockerfile("ubuntu2404", "ubuntu-2404", + trailer="".join(ubuntu2404_rust_extras)) # # Non-fatal Rust-enabled build