Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging

* cpu-exec: more cleanups to CPU loop exits
* python: bump bundled Meson to 1.9.0
* rust: require Rust 1.83.0
* rust: temporarily remove from Ubuntu CI
* rust: vmstate: convert to use builder pattern
* rust: split "qemu-api" crate
* rust: rename qemu_api_macros -> qemu_macros
* rust: re-export qemu macros from other crates
* x86: fix functional test failure for Xen emulation
* x86: cleanups

# -----BEGIN PGP SIGNATURE-----
#
# iQFIBAABCgAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmjK6ZsUHHBib256aW5p
# QHJlZGhhdC5jb20ACgkQv/vSX3jHroNBKwf/aadInCT4vASOfpxbwZgYfYgR2m2m
# BJE9oYKxZJ6MlEOU/1Wfywf9fg4leMSh3XxkDKkEIL19yS6emwin8n3SNYrdAFn3
# 6u4IIWO4NI1Ht3NKytrqFk9wtbH9pAs/gVHLlnmpMxIqtOtZLumPAKNz8rlantmK
# UVDYL3Y0L4pD9i5FK1ObMNpk5AsWNr8Tr64fmb+nTkHutld3sBrEMCLI0+EByGyN
# lQ16sLn9PGqHOr210zuQP7wP2T3NCI3YokFSPQrUUL8LZGxRdXoNF4hI4uZDKGdn
# UbtRu9EkM052qzfsFMrEw5JSbdxEfIjKlPoFKseMv+aWvNAuximAraD3Vg==
# =Lr+x
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 17 Sep 2025 10:02:19 AM PDT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [unknown]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [unknown]
# gpg: WARNING: The key's User ID is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* tag 'for-upstream' of https://gitlab.com/bonzini/qemu: (60 commits)
  accel/kvm: Set guest_memfd_offset to non-zero value only when guest_memfd is valid
  accel/kvm: Zero out mem explicitly in kvm_set_user_memory_region()
  accel/kvm: Switch to check KVM_CAP_GUEST_MEMFD and KVM_CAP_USER_MEMORY2 on VM
  i386/kvm: Drop KVM_CAP_X86_SMM check in kvm_arch_init()
  multiboot: Fix the split lock
  target/i386: Define enum X86ASIdx for x86's address spaces
  i386/cpu: Enable SMM cpu address space under KVM
  hpet: guard IRQ handling with BQL
  rust: do not inline do_init_io
  rust: meson: remove unnecessary complication in device crates
  docs: update rust.rst
  rust: re-export qemu macros from common/qom/hwcore
  rust: re-export qemu_macros internal helper in "bits"
  rust: repurpose qemu_api -> tests
  rust/pl011: drop dependency on qemu_api
  rust/hpet: drop now unneeded qemu_api dep
  rust: rename qemu_api_macros -> qemu_macros
  rust: split "hwcore" crate
  rust: split "system" crate
  rust: split "chardev" crate
  ...

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

1 files changed, 0 insertions, 180 deletions

diff --git a/rust/qemu-api/tests/tests.rs b/rust/qemu-api/tests/tests.rs
deleted file mode 100644
index a658a49fcf..0000000000
--- a/rust/qemu-api/tests/tests.rs
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright 2024, Linaro Limited
-// Author(s): Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-use std::{ffi::CStr, ptr::addr_of};
-
-use qemu_api::{
-    bindings::{module_call_init, module_init_type, qdev_prop_bool},
-    cell::{self, BqlCell},
-    declare_properties, define_property,
-    prelude::*,
-    qdev::{DeviceImpl, DeviceState, Property, ResettablePhasesImpl},
-    qom::{ObjectImpl, ParentField},
-    sysbus::SysBusDevice,
-    vmstate::VMStateDescription,
-    zeroable::Zeroable,
-};
-
-mod vmstate_tests;
-
-// Test that macros can compile.
-pub static VMSTATE: VMStateDescription = VMStateDescription {
-    name: c"name".as_ptr(),
-    unmigratable: true,
-    ..Zeroable::ZERO
-};
-
-#[repr(C)]
-#[derive(qemu_api_macros::Object)]
-pub struct DummyState {
-    parent: ParentField<DeviceState>,
-    migrate_clock: bool,
-}
-
-qom_isa!(DummyState: Object, DeviceState);
-
-pub struct DummyClass {
-    parent_class: <DeviceState as ObjectType>::Class,
-}
-
-impl DummyClass {
-    pub fn class_init<T: DeviceImpl>(self: &mut DummyClass) {
-        self.parent_class.class_init::<T>();
-    }
-}
-
-declare_properties! {
-    DUMMY_PROPERTIES,
-        define_property!(
-            c"migrate-clk",
-            DummyState,
-            migrate_clock,
-            unsafe { &qdev_prop_bool },
-            bool
-        ),
-}
-
-unsafe impl ObjectType for DummyState {
-    type Class = DummyClass;
-    const TYPE_NAME: &'static CStr = c"dummy";
-}
-
-impl ObjectImpl for DummyState {
-    type ParentType = DeviceState;
-    const ABSTRACT: bool = false;
-    const CLASS_INIT: fn(&mut DummyClass) = DummyClass::class_init::<Self>;
-}
-
-impl ResettablePhasesImpl for DummyState {}
-
-impl DeviceImpl for DummyState {
-    fn properties() -> &'static [Property] {
-        &DUMMY_PROPERTIES
-    }
-    fn vmsd() -> Option<&'static VMStateDescription> {
-        Some(&VMSTATE)
-    }
-}
-
-#[repr(C)]
-#[derive(qemu_api_macros::Object)]
-pub struct DummyChildState {
-    parent: ParentField<DummyState>,
-}
-
-qom_isa!(DummyChildState: Object, DeviceState, DummyState);
-
-pub struct DummyChildClass {
-    parent_class: <DummyState as ObjectType>::Class,
-}
-
-unsafe impl ObjectType for DummyChildState {
-    type Class = DummyChildClass;
-    const TYPE_NAME: &'static CStr = c"dummy_child";
-}
-
-impl ObjectImpl for DummyChildState {
-    type ParentType = DummyState;
-    const ABSTRACT: bool = false;
-    const CLASS_INIT: fn(&mut DummyChildClass) = DummyChildClass::class_init::<Self>;
-}
-
-impl ResettablePhasesImpl for DummyChildState {}
-impl DeviceImpl for DummyChildState {}
-
-impl DummyChildClass {
-    pub fn class_init<T: DeviceImpl>(self: &mut DummyChildClass) {
-        self.parent_class.class_init::<T>();
-    }
-}
-
-fn init_qom() {
-    static ONCE: BqlCell<bool> = BqlCell::new(false);
-
-    cell::bql_start_test();
-    if !ONCE.get() {
-        unsafe {
-            module_call_init(module_init_type::MODULE_INIT_QOM);
-        }
-        ONCE.set(true);
-    }
-}
-
-#[test]
-/// Create and immediately drop an instance.
-fn test_object_new() {
-    init_qom();
-    drop(DummyState::new());
-    drop(DummyChildState::new());
-}
-
-#[test]
-#[allow(clippy::redundant_clone)]
-/// Create, clone and then drop an instance.
-fn test_clone() {
-    init_qom();
-    let p = DummyState::new();
-    assert_eq!(p.clone().typename(), "dummy");
-    drop(p);
-}
-
-#[test]
-/// Try invoking a method on an object.
-fn test_typename() {
-    init_qom();
-    let p = DummyState::new();
-    assert_eq!(p.typename(), "dummy");
-}
-
-// a note on all "cast" tests: usually, especially for downcasts the desired
-// class would be placed on the right, for example:
-//
-//    let sbd_ref = p.dynamic_cast::<SysBusDevice>();
-//
-// Here I am doing the opposite to check that the resulting type is correct.
-
-#[test]
-#[allow(clippy::shadow_unrelated)]
-/// Test casts on shared references.
-fn test_cast() {
-    init_qom();
-    let p = DummyState::new();
-    let p_ptr: *mut DummyState = p.as_mut_ptr();
-    let p_ref: &mut DummyState = unsafe { &mut *p_ptr };
-
-    let obj_ref: &Object = p_ref.upcast();
-    assert_eq!(addr_of!(*obj_ref), p_ptr.cast());
-
-    let sbd_ref: Option<&SysBusDevice> = obj_ref.dynamic_cast();
-    assert!(sbd_ref.is_none());
-
-    let dev_ref: Option<&DeviceState> = obj_ref.downcast();
-    assert_eq!(addr_of!(*dev_ref.unwrap()), p_ptr.cast());
-
-    // SAFETY: the cast is wrong, but the value is only used for comparison
-    unsafe {
-        let sbd_ref: &SysBusDevice = obj_ref.unsafe_cast();
-        assert_eq!(addr_of!(*sbd_ref), p_ptr.cast());
-    }
-}