Failed in applying to current master (
apply log)
Maintainers: "Philippe Mathieu-Daudé" <philmd@mailo.com>, "Alex Bennée" <alex.bennee@linaro.org>, Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>, Magnus Kulke <magnuskulke@linux.microsoft.com>, Wei Liu <wei.liu@kernel.org>, "Doru Blânzeanu" <dblanzeanu@linux.microsoft.com>, Paolo Bonzini <pbonzini@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, "Daniel P. Berrangé" <berrange@redhat.com>, John Snow <jsnow@redhat.com>, Cleber Rosa <crosa@redhat.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Manos Pitsidianakis <manos.pitsidianakis@linaro.org>, Zhao Liu <zhao1.liu@intel.com>, Roman Bolshakov <rbolshakov@ddn.com>, Phil Dennis-Jordan <phil@philjordan.eu>, Marcelo Tosatti <mtosatti@redhat.com>, Pedro Barbuda <pbarbuda@microsoft.com>, Mohamed Mediouni <mohamed@unpredictable.fr>
MAINTAINERS | 1 +
docs/devel/rust.rst | 85 ++---
configure | 7 +-
meson.build | 21 +-
qapi/qom.json | 17 +-
include/hw/hyperv/hvgdk_mini.h | 5 +
include/hw/i386/apic-msidef.h | 1 +
include/system/mshv.h | 5 +
include/system/mshv_int.h | 19 +-
target/i386/cpu.h | 12 +
target/i386/sev.h | 4 +-
accel/mshv/mshv-all.c | 102 +++---
hw/char/serial.c | 1 +
hw/i386/fw_cfg.c | 13 +-
hw/i386/mshv/apic.c | 405 +++++++++++++++++++++
hw/i386/mshv/clock.c | 189 ++++++++++
hw/i386/x86-cpu.c | 6 +
target/i386/cpu-apic.c | 3 +
target/i386/emulate/x86_decode.c | 6 +
target/i386/emulate/x86_flags.c | 65 ++--
target/i386/machine.c | 46 +++
target/i386/mshv/mshv-cpu.c | 327 +++++++++++------
target/i386/mshv/msr.c | 40 ++
target/i386/mshv/synic.c | 206 +++++++++++
target/i386/sev.c | 304 ++++++++++------
target/i386/tcg/fpu_helper.c | 10 +-
target/i386/tcg/seg_helper.c | 3 +-
target/i386/whpx/whpx-all.c | 51 ++-
target/i386/whpx/whpx-cpu-legacy.c | 2 +-
target/i386/xsave_helper.c | 19 +-
tests/tcg/x86_64/segment-prefixes.c | 25 ++
target/i386/tcg/decode-new.c.inc | 46 ++-
tests/docker/dockerfiles/alpine.docker | 3 -
tests/docker/dockerfiles/centos9.docker | 19 +-
.../dockerfiles/debian-all-test-cross.docker | 2 +-
tests/docker/dockerfiles/debian-amd64-cross.docker | 6 +-
tests/docker/dockerfiles/debian-arm64-cross.docker | 6 +-
tests/docker/dockerfiles/debian-armhf-cross.docker | 6 +-
tests/docker/dockerfiles/debian-i686-cross.docker | 6 +-
.../docker/dockerfiles/debian-ppc64el-cross.docker | 6 +-
.../docker/dockerfiles/debian-riscv64-cross.docker | 6 +-
tests/docker/dockerfiles/debian-s390x-cross.docker | 6 +-
tests/docker/dockerfiles/debian.docker | 6 +-
.../docker/dockerfiles/fedora-rust-nightly.docker | 6 +-
tests/docker/dockerfiles/fedora-win64-cross.docker | 6 +-
tests/docker/dockerfiles/fedora.docker | 6 +-
tests/docker/dockerfiles/opensuse-leap.docker | 4 -
tests/docker/dockerfiles/ubuntu2404.docker | 6 +-
.gitlab-ci.d/macos-14.vars | 2 +-
.gitlab-ci.d/static_checks.yml | 4 +-
rust/Cargo.lock => Cargo.lock | 158 +++-----
rust/Cargo.toml => Cargo.toml | 7 +-
accel/mshv/trace-events | 1 +
hw/i386/meson.build | 1 +
hw/i386/mshv/meson.build | 5 +
python/scripts/vendor.py | 4 +-
python/wheels/meson-1.11.1-py3-none-any.whl | Bin 1078534 -> 0 bytes
python/wheels/meson-1.12.0-py3-none-any.whl | Bin 0 -> 1106208 bytes
pythondeps.toml | 4 +-
rust/bindings/chardev-sys/meson.build | 11 +-
rust/bindings/hwcore-sys/meson.build | 11 +-
rust/bindings/migration-sys/meson.build | 11 +-
rust/bindings/qom-sys/meson.build | 11 +-
rust/bindings/system-sys/meson.build | 11 +-
rust/bindings/util-sys/meson.build | 11 +-
rust/bits/meson.build | 7 +-
rust/bits/src/lib.rs | 24 +-
rust/bql/meson.build | 13 +-
rust/chardev/meson.build | 8 +-
rust/common/meson.build | 10 +-
rust/hw/char/pl011/Cargo.toml | 3 +-
rust/hw/char/pl011/meson.build | 22 +-
rust/hw/char/pl011/src/registers.rs | 108 +++---
rust/hw/core/meson.build | 10 +-
rust/hw/timer/hpet/meson.build | 17 +-
rust/meson.build | 26 +-
rust/migration/meson.build | 8 +-
rust/migration/src/vmstate.rs | 45 +--
rust/qemu-macros/meson.build | 12 +-
rust/qom/meson.build | 8 +-
rust/system/meson.build | 8 +-
rust/trace/meson.build | 9 +-
rust/util/meson.build | 7 +-
scripts/archive-source.sh | 7 +-
scripts/ci/setup/debian/debian-13-ppc64le.yaml | 4 -
scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml | 4 -
scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml | 4 -
scripts/get-wraps-from-cargo-registry.py | 6 -
scripts/make-release | 4 +-
scripts/rust/rustc_args.py | 80 +---
subprojects/.gitignore | 8 +-
subprojects/anyhow-1-rs.wrap | 5 +-
subprojects/arbitrary-int-1-rs.wrap | 10 -
subprojects/attrs-0.2-rs.wrap | 3 +-
subprojects/bilge-0.2-rs.wrap | 10 -
subprojects/bilge-impl-0.2-rs.wrap | 10 -
subprojects/bitfield-struct-0.13-rs.wrap | 6 +
subprojects/either-1-rs.wrap | 10 -
subprojects/foreign-0.3-rs.wrap | 3 +-
subprojects/glib-sys-0.21-rs.wrap | 3 +-
subprojects/itertools-0.11-rs.wrap | 10 -
subprojects/libc-0.2-rs.wrap | 5 +-
subprojects/packagefiles/anyhow-1-rs/meson.build | 33 --
.../packagefiles/anyhow-1-rs/meson/meson.build | 9 +
.../packagefiles/arbitrary-int-1-rs/meson.build | 21 --
subprojects/packagefiles/attrs-0.2-rs/meson.build | 33 --
subprojects/packagefiles/bilge-0.2-rs/meson.build | 31 --
.../packagefiles/bilge-impl-0.2-rs/meson.build | 44 ---
subprojects/packagefiles/either-1-rs/meson.build | 26 --
.../packagefiles/foreign-0.3-rs/meson.build | 26 --
.../packagefiles/glib-sys-0.21-rs/meson.build | 33 --
.../packagefiles/itertools-0.11-rs/meson.build | 32 --
subprojects/packagefiles/libc-0.2-rs/meson.build | 37 --
.../packagefiles/libc-0.2-rs/meson/meson.build | 16 +
subprojects/packagefiles/probe-0.5-rs/meson.build | 22 --
.../packagefiles/proc-macro-error-1-rs/meson.build | 41 ---
.../proc-macro-error-attr-1-rs/meson.build | 31 --
.../packagefiles/proc-macro2-1-rs/meson.build | 35 --
.../proc-macro2-1-rs/meson/meson.build | 6 +
subprojects/packagefiles/quote-1-rs/meson.build | 31 --
subprojects/packagefiles/syn-2-rs/meson.build | 43 ---
.../packagefiles/unicode-ident-1-rs/meson.build | 22 --
subprojects/probe-0.5-rs.wrap | 3 +-
subprojects/proc-macro-error-1-rs.wrap | 10 -
subprojects/proc-macro-error-attr-1-rs.wrap | 10 -
subprojects/proc-macro2-1-rs.wrap | 4 +-
subprojects/quote-1-rs.wrap | 3 +-
subprojects/syn-2-rs.wrap | 3 +-
subprojects/unicode-ident-1-rs.wrap | 3 +-
target/i386/mshv/meson.build | 1 +
tests/lcitool/mappings.yml | 26 +-
tests/lcitool/projects/qemu.yml | 4 -
.../{opensuse-leap-15.yml => centos-stream-9.yml} | 0
tests/tcg/x86_64/Makefile.target | 1 +
tests/vm/generated/freebsd.json | 4 -
135 files changed, 1915 insertions(+), 1664 deletions(-)
create mode 100644 hw/i386/mshv/apic.c
create mode 100644 hw/i386/mshv/clock.c
create mode 100644 target/i386/mshv/synic.c
create mode 100644 tests/tcg/x86_64/segment-prefixes.c
rename rust/Cargo.lock => Cargo.lock (69%)
rename rust/Cargo.toml => Cargo.toml (96%)
create mode 100644 hw/i386/mshv/meson.build
delete mode 100644 python/wheels/meson-1.11.1-py3-none-any.whl
create mode 100644 python/wheels/meson-1.12.0-py3-none-any.whl
delete mode 100644 subprojects/arbitrary-int-1-rs.wrap
delete mode 100644 subprojects/bilge-0.2-rs.wrap
delete mode 100644 subprojects/bilge-impl-0.2-rs.wrap
create mode 100644 subprojects/bitfield-struct-0.13-rs.wrap
delete mode 100644 subprojects/either-1-rs.wrap
delete mode 100644 subprojects/itertools-0.11-rs.wrap
delete mode 100644 subprojects/packagefiles/anyhow-1-rs/meson.build
create mode 100644 subprojects/packagefiles/anyhow-1-rs/meson/meson.build
delete mode 100644 subprojects/packagefiles/arbitrary-int-1-rs/meson.build
delete mode 100644 subprojects/packagefiles/attrs-0.2-rs/meson.build
delete mode 100644 subprojects/packagefiles/bilge-0.2-rs/meson.build
delete mode 100644 subprojects/packagefiles/bilge-impl-0.2-rs/meson.build
delete mode 100644 subprojects/packagefiles/either-1-rs/meson.build
delete mode 100644 subprojects/packagefiles/foreign-0.3-rs/meson.build
delete mode 100644 subprojects/packagefiles/glib-sys-0.21-rs/meson.build
delete mode 100644 subprojects/packagefiles/itertools-0.11-rs/meson.build
delete mode 100644 subprojects/packagefiles/libc-0.2-rs/meson.build
create mode 100644 subprojects/packagefiles/libc-0.2-rs/meson/meson.build
delete mode 100644 subprojects/packagefiles/probe-0.5-rs/meson.build
delete mode 100644 subprojects/packagefiles/proc-macro-error-1-rs/meson.build
delete mode 100644 subprojects/packagefiles/proc-macro-error-attr-1-rs/meson.build
delete mode 100644 subprojects/packagefiles/proc-macro2-1-rs/meson.build
create mode 100644 subprojects/packagefiles/proc-macro2-1-rs/meson/meson.build
delete mode 100644 subprojects/packagefiles/quote-1-rs/meson.build
delete mode 100644 subprojects/packagefiles/syn-2-rs/meson.build
delete mode 100644 subprojects/packagefiles/unicode-ident-1-rs/meson.build
delete mode 100644 subprojects/proc-macro-error-1-rs.wrap
delete mode 100644 subprojects/proc-macro-error-attr-1-rs.wrap
rename tests/lcitool/targets/{opensuse-leap-15.yml => centos-stream-9.yml} (100%)